Added Swagger and error handling. Not working yet