First attempt to include general conic sections

The fits don't always work