Added google controller stub
Added click controller stub, improved saving logic on phone