Oh boy what a mess this was lmao, I definitely should have done this is more atomic commits But it could also be argued that very little of this is standalone
