Removal of Vec2/Vec3 - Moved to more abstract Class

This brought it's own problems, but it does currently work which is
nice.