Experimental

major changes in the experimental branch, and stable enough to make it the master.