Scaling - initial draft 

Marek please review the code