Commented on stop-gap data structure
Merge remote-tracking branch 'upstream/master'
Adjust test to match change in ListenHttp
Set up defaults so it doesn't crash in tests