Added XML support
Added 'sample' support
Lots of notes
Refactored DSL