Began implementing match structure