Major update, OOP-likeness