Second attempt at updating collision and stoof

You don't heff to be mad.