Message classes now use pair class and are correct according to algo. Deleted proposal