Experimental

Putting the API hooks in.