Displaying matches
Move all code over

Still need to fix up for new structure.