Integrate editing for chapter 6
Rename Point to Vector throughout