Some further class design.