rework parser to use parse actions instead of having to reparse xml
2 files changed