Changes in the trouble branch
Mainline work
Fixed conflicts in experiment
Bob's work was great
even more great work from Alice