Api

@armendariz hey what do you think about these changes?