Updated to use the latest Experimental Base Class Release NOT READY FOR RELEASE!