continued work on Config and rebuild
commit