Add my rewrite of Menus (#1)