more api stuff
merge api