Adding in completion tracking
Allowing termination at completion