Updated various parts of the current order process with new syntax introduced by the master branch. TRAD-20 #time 20m Dev work