Stuff
NextGen is now its own class
R2 is now its own class