You got it.

Right now I'm looking at 4 more for Fire and 2 more for Firaga to get 24 and 12. It'll make it a little weirder than 16 and 8 or 32 and 16 so bear with me if the format is a little odd!