Better work in progress management...