Feature/tagging sub 2

This is the implementation of subcard 2 with e2e tests