simd branch ready for review/merge