Yet another refactor - really, if you look at these early commits and they don't make sense, that's totally okay. I'm messy with commits when I am solo and bootstrappin'
Build working again. Tests? I should have tests. I kinda just want to build stuff and worry about tests later.. famous last words.