Yeah sounds good, I've spun these out into two separate issues, #356 and #357 .  I'd like to see the code here in this pull request land and then take on each one separately.