DB remodelling

Yeehaw