Working on wifip2p stuff