Mod #1320 Calculate Base Cost = Market + Markup

Change the calculation for Base Cost to be Market Cost plus Markup.