Fixed a bunch of variable refrences to remove instances of settings and add instances of self where variables previously weren't properties of the object. Still non functional but no errors on variable refrence now. Settings seem to not be populated after the merge