Finished the first half of doc tagging