Started implementing settings saving