Further work on command impl.