First pass of API design completed