Daily Commit

Massive Work Done. Added User Settings