Compiles
Changed up the nessesary globals and types for it to all compile.
Should really figure out how to exclude objects from the repo...