Working Alex's classification and db comments.