MOAR collision testing
merge