Switched to use a singleton. Scan when building.
Switched to using the Site singleton.
Grab the site object via Site.instance.