Second pass at matching + capturing code.

Getting closer!