Collision resolution finally works (For the most part)