WIP: command restriction code written but untested; coredumps in apparently unrelated code.