use a Fee model, clean up code, finish the calculator with ajax and removing of fees for both carrier and client