made it to where progresstest boke simply, haven't tested other files as i did not finish changing parser. Also commented out a debug statement in match