Well, it is done, but it will still take a little while to get everything perfected. I still have to connect the DataStore to the rest of the Configuration Factory, so I still have one more day to work before I'm finished and I have another day of testing before the refactoring is finished. It will probabably take another day for the XML, but I think if I use SimpleXML, it will make it easier to finish. It will have to take XMLWriter or XML DOM to do the document writing and updating. The nice thing about DOM and SimpleXML is that I can link both, but it would be nice to see what XMLWriter and XMLReader can do.