Worked more on collision

Still not working. Will most likely redo the current method from scratch.