Started threading the configuration code in a bit. Probably going to
take a few tries to get it right.