Experimental menu rewrite, partway complete