Merge in a bunch of experimental features