Feature/tagging sub 12

SUBCARD 12 implementation and tests