That happens to be @vykster and my homework due tonight! We are in the process of creating a completely new class object for it (considering the name Matcher), though we still haven't fleshed out how we're changing out the regex matching or whitelisting. At least for tonight we'll still have an explicit list of site names to check against.