Experimental

merge (just in case) and delete the experimental branch into master now that it is not needed any more