API almost done