Change to heartbeat and add some docs