Wip/settings

merge the other one before this ;)