Updates to settings
Rough start to feature functionality