Particle fixes
Shuffling things about - figuring out how to handle nested templating