Major Changes Part 1

Lots of things should be fixed/implemented now, but still more to go