initial work on entity-store module