Added support for lines 0-1, and for XXX's that start at the beginning of the line