Not completely sure these changes are complete, but I don't get errors locally w/ comparison or get strange data.
@diosmosis feel free to merge if tests pass. We can always adjust demo later again as it's hard to test/know if it fully works
ProxySite has tests but they don't work so well anymore, I can use those to get a better idea.
Undid one part of the change, had to be fixed in ProxySite, will merge if tests pass.