Added Geo in as an enrichment
Added TODO re. implicit