Added a bumch more api stuff