A bit of a refactor, ParticleSystem took a hit (not working)