Major DB overhaul

Drop and migrate again