Marked stuff as done
Renamed "HeartbeatClient" to "Client"