Updated to use the latest experimental base class -NOT READY FOR GENERAL RELEASE!