Added collision detection

Also added random features