first collision detection added. VERY buggy