begun menu and refactoring