Added phase 1 of the API implementation