TASK-8: Get discovery working and populating list