Bit of a revamp of how the settings work which I think gives more
flexibility and is more logical