Issue #2 - WIP

- refactored a few things
- left a few more TODOs in the code
- got everything building and XML tests are passing again
Issue #2 - WIP