added to network functionality - still incomplete