API completed to Spec

API completed to Spec on to the next thing