Scaling - initial draft 

Marek please review the code
Missing space after #.