Rearranged command thingy
did a bunch of local peer discovery stuff