WIP, changing around menus for the different menu decision
Merge remote-tracking branch 'connor/Saros' into Saros
WIP ?