Started working on replacing matches list with a table. broke some things doing it. :D