Broken but refactoring to use the new vector classes.