Trying to shift to object-orientation