Added controllers and views
Merge pull request #1 from littleredninja/mkirlin

Various changes.