Working collision detection
Fix modifiers of methods/attributes
Merging COLLISION_DETECTION with master