Add phase two of Google Sync #19 #47