Add geo support

WIP