Started to mend pair logic. Still a long way to go but progress has been made