Added two more vendors.
Merge branch 'add-more-vendors' into working
Broke functionality and saving state.
Successfully converted to a better object tree.
Merge branch 'better-charge-calculations' into working