Working on discover method and handlers for unknown and waiting
temporary save
Merge branch 'sami' into phsen