Switch to more class-based approach.