issue \#979 RaceCondition Nailed

Seriously complicated PR, and I plan on doing a hangout with @aesnyder and with anyone who cares