Refactor - Change how the command class is implemented / organised.