Mid-refactor commit of menu.