API now mostly coplete, and partly tested.