[PENDING] Migrate to Vector2D