Optionally log things, refactor response handling
Handle the 504 explicitly, don't worry about content for now