Working with commands.
Fixed merge errors.