cleared out local .json files
made changes
weird merge
commented and documented the hell out of this