Parity

@cjellick @ibuildthecloud 
Point of note: It makes sense to me to make sure we do capDrop in the same release as capAdd. So, if you're prioritizing, I suggest bubbling that one up.