Working out scaling
Armen said so
Fixed minor issues
Getting ready for larger changes
Merge branch 'scale'