Big refactor for composability with articleMarkers, still more