Melissa/settings

Should use `self.` syntax here