move some api stuff