Implemented Discovery and stuff