Trying to rewire some of the command objects