Messing around trying to get S&H data imported
Importer fixed
Merging upstream master
cleaner text