Async fixity

Now taking suggestions for unit testing this... @ajs6f ?
https://www.pivotaltracker.com/story/show/60885728