Now 5% more object oriented. :)