Kickstart database

Moving from #362, so that we can both push changes.