Added initial tagging code