Continued work on configuration code.