Yet to add heartbeat code to test the server