Stopping point, most pairing removed, moving onto unit tests.
Merge remote-tracking branch 'origin/master'