Lots of cleanup. Removed a ton of compile errors. Now debugging