api init
Merge branch 'feature-api' into dev