Experimental

This is a huge pull request, it is the first of what I hope will be monthly pulls from experimental into master. Take a look at it and let me know what you like and don't like.