Removed un-needed string variables
Added some math, but getting wrong values. Work in progress.