Research into fixing distance
Add TODO for y-velocity change