stuff
merge conflicts
newtonsoft shenanigans and some tweaks to some stuff