CRI-stuff-b22a466
CRI stuff  Closes #52