Collide bug fixed (adding files to previous commit that i missed)