work in class, working on Ray generator next