WIP on commands changes.