Collision detection

now works with all shapes, including concaves