Fixing all the broken things

The code will now compile! Yaaaay!