Added some scaffolding for yet another collision bug