Work on implmenting tags