Move PSP functionality into handleP2P, general clean up with this --> self (scoping issues).