Swapping done
Filling still buggy, but does not introduce triplets
Refactor match finding algorithm