Redid Pair. Single parser, no need for proper/improper separation. Could use more testing.