Progress with geo stuff