More design changes to make things more object oriented.