Giant WIP commit. I am a bad dev.