Cleaned up pco2w_abc_dcl code branch.  Ready for merge.