Building up more of the api, final commit of the day