Implemented some stuff having to do with the API