Starting to add views and templates