Thanks, Guys!

Yes, bottom bracket is next, then headset.

I remember repair jobs that took four hours: 30 minutes for the work, and 3.5 hours searching for the part that fell on the floor.