Cleared up the models a bit, dropped and re-created the database