In the haggard middle of refactoring MenuItems