More work done on entity classes, but much left still.