Hierarchical config

Se, rebased. Any comments before merging?