OOP beginning added