Added current API implementation

I think I did this right.