Multiclass and function chopping

Continued function chopping and supporting multiclass