Refactor for 1.7.2

Most things up to date
Some things a little buggy
Some things removed
A few errors making it playable, but not recompile safe