renamed 2 files
settings now linked to data