I really like the idea of Charles helping Noah get more control of himself, too. Noah might not be a mutant, but it's Charles' thing, to help kids come to terms with their unusual abilities.