I was thinking whole event yup! It'd be funnier imo, and he sleeps in bird form so he'd just wake up that way and be thrilled not to have extra wings etc.

He picks locks though. So he wouldn't be the best bird to try to keep caged.

Edit: And I can have him unable to speak all the beginning until things start