Updated with merge from Ryan/Bob.