Names added. Discovery sort of working