Wip/settingsfiller

More commits will follow later. You can review and merge if you want, if this gets closed I'll open another pull request. So far this is only preparations for implementing a SettingsFiller.