lots of stuff around model.  Moving mvc stuff around