Completed settings module

Also fixed some calls that would break usage of repositories, and make
them separate methods…