MAJOR EDIT: Got rid of entity classes. Stuff might be broken