Remodeled the model layer, lessened the dependancies on protocols.