Parameterized Pair class; some cleanup; Parameterization for Matrix value still yet to finish