Lots more work on remote functionality