Delay in Matching

I'm getting some weird results with this.. Looking into it before pulling into master. I might make changes to the branch, so make sure to pull again if you decide to work on it too.