Do answer asynchronously now.  A little cleanup also.