Working on geo fail
Workin on fix
This branch works better
First attempt at cleaning up this nasty code
Merge fix