Incremental addition of some of my old configuration