Removed stopDiscovering circular calls error. Much Refactored. many clean code. WOw
TODOs refactored.