Frame refactoring part 1.