Made a start on adding settings