Refactored code to set command option in an array prior to passing to the command. This will allow us to pass it to events so it can be modified as well as make step debugging easier.