begin mentor refactoring
revise app