added tagging functionality
completed tagging functionality