Changed twopoint to a 2 point struct