Refactor to use Vector2I for integer positions