Committing Ernesto CASL patch 7

Addresses part of #70.  #149 must be merged before this.