-Added some of Joe's stuff from his branch and fixed a few things
-Networking is a little better now, but not there yet