Changes to database structure for ordering, untested, I need Mikey to help now