Moving struct to using bignumber for all values