Collision resolution is now somewhat working