Refactor. Get rid of some blocking code.