Initial untested commit of multi isoform version