Bastion: moving over menu and writing tests.
Merge pull request #2478 from waldenraines/bastion-menu

Bastion: moving over menu and writing tests.