Resyncing with the janrain code in my stash.