Reworking to allow for circular to be generic polar/cylindrical.