Rewrite to create new vectors + tests. Whee!