Adding collision detection among other things