WIP: Add bvals/bvecs