This version uses only subunits, not quite what we want
Adds locations and start of labels