Fixed a derp
Merge branch 'orders-lh'
Resolve conflicts for merging