Finish implementing new matching code and removing older code
Finished implementation of new faster version of application
working on priview speedup