Okay, the implemented stuff passes

Will try next with the real config files. But I wanted to commit before
screwing things up even more.