Added Network class
merge conflict