Async fixity

Now taking suggestions for unit testing this... @ajs6f ?