Added P2P testing. Todo: Trigger