Ready to merge.

This should be my final change to the experimental branch before I merge
it with the master.