Feature/now 237

Do we want this for all models or just comments?