More extracting, settings module

wip