Clean merge of James' Damon's, and my work.