Polishing EKE classes to encapsulate the progress & waits...