add api stuff
lalala
Merge branch 'master' into api
api v1 - yay