Move command

move to using command pattern