Revert "Revert "Collision debugging""

This reverts commit f5a3114fba6b73b0b3de47a4d1a67d404ffa9f78.