Increased abstractions in Presenter and Model.