Started adding basic settings