Closes Feature #1657
New Order Options