added initial code for discovery in new layout