Should we create tasks for these last two, or?