New controller and index view
forgot a comment
forgot another comment
Merge branch 'wip'