Committing Ernesto CASL patch 8

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