Streamlined ORder form logic

Yup