Discovery

Don't merge.

Simon, Luke - started to implement a new flow for adding/discovering components. Check it out and let me know your thoughts. Thanks!