initial work on entities