Collision update

Masks added to the collision detection module