commiting weekend work on the api