updated to have new networking code, DO NOT DELETE, OR TOUCH THE NETWORKING CODE, we will go over it at our meeting
updated with merge