forgot to commit settings implementation