Made the selection a part of the model by overriding the shapes in the model with the more up-to-date shapes from the selection
Fixed implementation of shapes and vertices in the selection