Updated to use non-constructor Vector2D
Refactored to get rid of constructors
Minor name change to argument