Vectorized

Next take on #120.