Began implementing entites, and did some other stuff