Initial commit of new tagging code.