Added Heartbeat stuff

Please add as well