More vectorization

Worked through the vector math