Amounts

Now that the branch un-merged, here is the same pull request again with the issues fixed.