Making things more object oriented