Added some more client node code