Heartbeat

Can you review my code and see if its ready to merge?

Thanks!