Slight refactor - beginning work on global settings file