Uncommenting the MFD_Mode button code.  Actually found a hardware bug.  Pullup resistors on two pins are not working.