big renames and small changes to Bond, start of introducing BondModel