still consolidating the mvc classes