Tie in custom whenever task.  Oops.