The last patch brings it all inline with the spec, and passing the schema. There is still some work to be done, however that will take more time. I believe it is now sufficient for release. I can add in event types and more equipment mapping after the release. Thanks for all the help.