Starting to extract marking structure.

It’s not going to be pretty - maybe that’s the limit of customisation?