Bond -> BondModel, many related changes.