Completed basic API draft