Proposed to nanograv/PINT
Cleaned up