p2p data synch working, but needs cleanup and tests working again