Last small changes before this gets closed before
I end up killing Sunpy by accident.