Implemented working Option menu, including command map