Added singleton - unsure if I like this or monostate/borg more