#16 - Controller and views added