working on the calculation, before database updates
trying to create the calculator - including some modifications to the creator and finance views