Feature/delegate google

Refactored so it uses Google Delegate