Now dealing with multiple endpoints, better handling of unexpected responses
Merge branch 'timeout-handling'