First pass at CXF attempt.
More work for CXF.
Make PATCH work.
Clean up a bit.