@yetanotherion - can you fix this up once this pull req is merged?  I think it will require a bit of work on RemoteCommand.