Adding tons more data, moving around match insertions to display correctly.