Further isolate each group of commands from the central code. (dm)