Added ability to continue once initial task completed, squashed bugs