Working on oop solution