[minor] Progress on client-side heartbeats #32