Working on the settings and setup functionality