Bill, would you sanity check this? appears to work on dev