more work on cart, better organization for fields