Class change without tree reset

Finally completed. All conflicts with master have been solved and logic works correctly to find all start nodes now.