Code

Make ControlPointSelection trackable to prevent random crashes