Changes to functionality. Still needs changes to Order.