Thanks all, I'll look into these. I know my bike shop has the crank tool, might have to order the other ones.
The BB sounds pretty gritty in spinning it. One step of this process is soaking the frame in oxalic acid to remove the rust so I just assumed I should completely remove the BB for this process. I already did the fork and it made quite a bit of difference.