Continued work on network mapping and friends tracking