Override annotations and swapping over to the new vecmath classes. Still a lot of work to do.