Started merging back in SpVM code.