Adding settings (in progress...)