Re-wrote CPECommands class.