Updated methods in all classes

Experimenting, no set things yet