Started moving towards a class-based approach.