added customerName, fixed delivery, added subtotal, and TESTS!