Adding Nodes. Work on streamlining device discovery. Code cleanup.