clean ish start
finishing logging
Merge branch 'gift'

* gift:
  finishing logging
  clean ish start
finishing up migration