More planning

More on classes and stats.