When we get the package tangle code merged, I'll re-visit this PR.