Trying to update the bond model.  Final version needs work.