moved puppet tasks into their more appropriate puppets