Change to point, no vectors.
Use point without namespacing.
Impl sub.