Trying to object-orient everything!
Small change