Setting up frame for refactoring #9