lots of changes to the model
various changes
made all entity classes derive from EntityBase
minor