partial progress
order matching is a bit more robust, clearer... but need to incorporate fees again
resolving conflicts and merging