About to move dropbox code - checkpoint in case it all goes wrong"