Unasync google

incomplete as I ran out of time.  If someone wants, they can cherry-pick progress from here into their branch and finish it up.