Updates to the Database Structure

added some bits to the DB, knocked off a todo list item