Rework a few things and start getting to the configuration.