Feature/tagging sub 4 andrew changes

feature that will be merged to main feature branch

includes subcard 4 and 8 changes