Okay, this is a good point - we don't want to call the exchange twice if we don't have to.  Do you want me to work on this, or do you want to make your own branch and work on it?