Scaling

Detailed commit notes