JJH:  validation works, and so does everything else
JJH:  validation and clean-up
Merge pull request #1 from jjhancock/recovered-cxf

Recovered cxf