Timestamp incoming and Wait for everything InFlight to drain/error

Using a WaitGroup may be a little heavy handed, but I don't think
it will be too bad. Plus anything I could roll myself would likely be
less performant.