Api hookup

If theres a merge problem, let me know