Network branch

Changed Network class to use new API