converted all types to decimals - big refactor