Pull request for entities and such

Yay for cleaning up imperfect code, and adding new features!