Merging nick into master2

because the original master still thinks it's wildly different after I merged. Whatevs.