Keep representation

Replaces #107 

@Cadair - this is inspired by your changes in #107 but makes sure we do force a conversion to spherical if not already in spherical coordinates.