A bit of work on FireworkGroup
The code is quickly becoming more and more complicated.