Complete rework - more required.