Working on new network implementation