Initial work on Match State handling