Comitting Ernesto CASL patch 4

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