Adding a whole bunch of new features for experimentation.