Nearly works
Could be simpler, should standardise how we apply config somehow without the complication that I was doing before