Lots of changes with trying to fix remote data