Added more functionality to all of the classes

...
sadasd

asdasdassa