Made the matching work and made significant changes to the programs' framework

Made the matching work and made the program more object-oriented. There are still some bugs, and I believe to have marked at least a great number of those with todo's.