More refactoring
Changed command definitions to suit new remote