Collison detection
Added initial collision detection