Redid database schema, set up basic controllers and models to match