Commit Janath's client and server communication-side code