Fix group matching
Got tracer working again