Now 10% more object oriented.