finishing off the model/schema changes