got all of the code to actually compile again

I don't think it actually works though.
33 files changed