Updated API Logic - will release to the public soon!