Did a bunch of stuff with getting entities to work.
Cleaning up a bit.