Initial spike from Ian.
Merged with Robbie.