Implemented more match stuff