* Replaced all connect code with vanilla node (a clean up is required tho!)