Move logic into post message and fix add_order