Added views and controllers for real this time