Added activity for P2P.
Refactoring and renaming.
Added TODO.