First pass at new menu system #127 #128