Work in progress...
Factor out the signal tracking as a helper class.