Temporary git for glhck's upcomming collision code.