WIP: rebase with prev - correct DB creation, ugly binding