More work done on entity classes, much left to do.