Changes to all classes + inclusion of CatExplosion