First pass at having a seperate system data structure.
I broke everything in entity management! (rewrite). Now let's see if I can put it back toghether in the tests.