Issue #2 and Issue #3 - WIP (xml conversion works)