Fixed up database structure - Brian+Sam