Gemini addon

Merge into base