More work on Heartbeat.  Not quite finished