Global scaling 

Part one - scaling added, but little refactoring done. Tests may be setup in a strange way.

No python integration.