spireland - probably last commit for this feature. Not going in dev.