Seperate out the database tasks
fixup