Some work on the basic Entity class