Added working collision detection \o/