working on entities, .. various stuff