Prepare for upstream get

Unfinished rework of particle system - completely useless so far