@wip redesign of the database
db wip