refactor to db migrations
more