Drafts, db refactor..