Controller - View approach

Closes #2 
Closes #10
YOUR PULL REQUEST IS KILLING MY BROWSER!