Config

Hoping @jdotpz can have a look over this and confirm that it mirrors his changes and request from last week.