Mockups, refactoring.