Optimize match

I want to leave the time logging in for now, until we get everything optimized.  I'll take it out later, most likely.