Create views and controllers
Create views and controllers
Merge