integrated Ryan's latest.  Needs some more messaging but got all namespace issues worked out.