Refactored experiments a little more so that they were more self-contained.