Still working on drop updates to db and page models