Added income calculation
Added risk to rate calc