Added fields for calculations, and first cut of formula for Dollars per Hour