fleshing out main menu
Merge origin/master