API Implementation

Bugs still persist