Testing networking stuff
fixed merge issues and renamed variables
fixed merge issues and renamed variables
Fixed merge conflicts FINALLY