My version, in process of updating with the newer Sunpy