Intermediate Checkin

My computer blue-screened and fucked my repo, so I'm committing
everything I have before I clone. Likely does not build.