Refactor commands work in progress.