Settings now working in first version