More work on porting the geo module