Final update for now. Tests are a bit hacky, but I need to figure out a cleaner way to make background requests