Settings

Ok I merged the current version and everything appears to be working.