Settings wired up
Fixed merge conflicts