Experimental branch

Ready to merge!