Version ready for Matt's experiments to be included.