Still needs more work for multiple messages in flight