Add w.i.p. heartbeater stuff.