Changed how Settings work, added tests, and moving toward production app