Added whilst loop to the front of the async.waterfall.  It's not working yet.