#61 progeo refactor