Changed the pair list to use an actual pair rather than keeping two lists.

Signed-off-by: Brian Hubble <brianhubble@gmail.com>