Refactor how we track in-progress operations.