Started adding settings
Finished settings feature