Removing blocking IO (still 2 left)

Now need to make more task-based interfaces