Still prepping for cr/lf update