Initial refactor
Re factor, adding more logging
Fixing / Updating file with new Network layout