using PeerStorage with still broken injection...