remmoved global signals and added them to the router class. 30 tests still failing