settings update
Working for the most part, need to get dependencies figured out
Merged everything, hopefully everything is fine now