Part 1.5 of configuration stuff