Split out more functionality, now driven by config