Tried tightening up async and upgraded Vineyard library