Almost done with MainMenuBuilder, pulling to get Ivan's work.
Merge remote-tracking branch 'origin/rework' into rework