Added a bunch of code in all the classes