Pre-stage conversion
Menu system merged from Adam.