Made CollisionSystem work.

Hopefully.
Merged parallel changes.