End of week 3 including CParticle class