Particle system version 2

Based on the latest and greatest