more model/view/controller consolidation