Fixed error
Not even sure what I changed
Added network management, see NetworkArchitecture.png in the root of the git repo for more info
Merged Conflicts and removed debugs