More work getting geo into place