Finished refactoring existing views and models