TASK-8: Get discovery working and populating list
Merge pull request #14 from DanLatimer/topic/TASK-8

TASK-8: Get discovery working and populating list