Working on config. Part of #512