Command structure fixed (first stab anyway)