Making way for new/last Sho version
New (probably last) version, mostly a rewrite