Rebuild OK, tests passing, menu_getchoice is in progress