Unstable commit: implementing settings