Swapped back to using doubles for values rather than strings.