New commits, working DB part