Started to flesh out the configuration logic