Finish basic order management
Fix up order product