Le derp continues work on the vectors and positions of stuff. Testing will be hard though..
Merge remote-tracking branch 'master/master'