added working geo stuff