Integrated nconf and a few other things, this resulted in major refactors