Fixed (but still failing) collision system