Freeform cart v2 1

More refactoring for cartmaker & freeform cart. Tests work.
Should we update these to pull the local files?