WIP more work on entries in the DB