[WIP] Adding to the API