A lot of changes and a more reponsible engineer would break these out into concise PRs but I'm not that guy and write titles that are way too long

A lot of changes and a more reponsible engineer would break these out into concise PRs but I'm not that guy and write titles that are way too long #682