Working on updated to MVC design
Added a TODO comment