Had do (semi-) duplicate this function call, which I didn't like... about the only thing I didn't love about this checkin.  I like this code! :D