fix: fix Command mechanism for move cmds in non-locked state

if not locked use the Command mechanism, and only pass move commands if locked.