Uhh changed to use vectors instead of passing around lots of x's and y's
Uh changed to use vectors to store positions and velocities