[RFC] Refactor Adjustments & Order to reduce logic

IIRC this would need to be full namespace to work...