Finish G+ stuff still needs testing