Latest code

Code inclusive of latest changes, see:

https://github.com/peterdougstuart/PCWG/pull/3