Settings functionality finished

Merged my code changes with Cody's changes...everything should be good
now assuming we don't work at the same time on different commits