Start working on heartbeats.
Fix merge conflicts.