X.X too many lines.

Significant feature creep while working on this pr...