Entities working! Lots of updates
may have messed up repo
entities are done