Node Client Almost done
Merge