Again, I take that back. Now it's adding the $34.97 to my hardware product if I don't have software included in the cart.
Here's what I'm working with: product-list.php
As long as their is at least 1 software item (id 2) added to the cart it's calculating things correctly. When I don't have software added, though, it's adding the 34.97 to the price of the hardware and throwing that into the total. So the subtotal shows the correct price of $49.97 but then the Grand Total is showing 84.94. It's not showing my the discount lines in the summary, though, so I'm a little confused here.