More work on class storing settings