Collision working much better - still not perfect...