2 controller view

Closes #2 
Closes #10