[#50640623]
-flesh out OrderItem a little
-fix a test error
-start another story (incomplete)