stage 3: Need to manage stuff by db version