I see your comment above. This will need to be rebased after the other PR goes in, but I don't think it will be too hard to update things.