MOAR work on Menu integration