Close to getting API done