Added more stuff to the new collision system. This is still very
experimental.