Almost completed change to Vector