Working on discovery
Merged, changed command handling