The view should be a separate commit also