Feature/tagging sub 13

implementation and tests for sub card 13