All Upgraded

Mod compiles and runs
Still some glitches