Lots of changes. ConfigFileSystem beginnings.