Refactoring, preparing to change Matrix.settings dynamically.