Started adding settings stuff