We'll end up getting this in for 7.1. What you've come up with is pretty close to how we'll implement it.