[White changes] Completing (?) solution class