Refactored the code, moving some things around
Wait for peers in a different way...