Stockholm format parser/writer

This is in the new parse format that @ElDeveloper created in #235 so merge his first.
The above two lines should be removed (notice that the headings below) - my guess is that this was an error while trying to resolve a merge conflict.