Initial work on custom Api Endpoints