starting to rebuild configuration and functionality