Comitting Ernesto CASL patch 3

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