Big overhaul of MVC with help from Lee and Sai
Clean up, refactor, and MVC