Pr/scales

As requested, part one of a two part pull request.