Reworking parsing to not break up lines initially