Add interest rate calculations, etc.