(Menu) Refactor menu_parse_and_resolve pt. 2