exactly, just need to add a few `when` flags on a couple of these.  I may even split out the commit if I'm feeling ambitious :)