Harrington tag set

Let's merge Matthew's tags into the master branch.