[#1] More work on order also TODOs added.