TASK-2: Add Initial discovery code

* Will need to fine tune once we have a UI