Pr/scales

As requested, part one of a two part pull request.
The second one depends on the scale code, so I'll submit that one after we check this out.