Started collision

Haven't actually implemented it completely yet. Need to decide how to
organize data.
Revert "Started collision"

This reverts commit 078950ed983613b43ca96bc197a02b0755dad922.