Feature/tagging sub 10

subcard 10 implementation and tests