[FOLD] add TODO text
[FOLD] Rename and refactor. Small updates.
[FOLD] PeerFinder work