A lot of refractoring mostly settings related