WIP new note XML parser & refactor to adaptor.

started breaking tests.