still broken, but API is coming in to shape

Change-Id: I1344f3c9537884f7bd34832c1fd1bc5cda0c44eb