Commiting the rest of the code
new views and specs