More experimenting with command editor (working prototype)