Merged Ian's things. Now up to date.