rewrote the match parsing already, more dicts