finished apis
Merge branch 'backend'