API complete - still somne work to do