Initial entities
Start working on Entities, fixing up schema along the way