Adding missed files that actually use the config object

Missed most of the actual work that should have been pulled.