Moved NetworkManager, fixed up some more network code. Almost there!