api stuff
merge conflicts