I'll try to smush these together after a bit; I wanted to get this merged so the build wouldn't be so red.