Finished implementing API