db stuff. order stuff.
fixed merge prob (handler.clj)