refactor again to use bookshelf, 0.2.0-pre.2