Moved some stuff around, attempted to get db setup