Adding in arrowmap code from last weekend.