Wrapper; geometry; moving geometry to utils where it should be for parity with the rest of the API