TASK-2: Add Initial discovery code

* Will need to fine tune once we have a UI
Merge pull request #2 from DanLatimer/topic/TASK-2

TASK-2: Add Initial discovery code