Test cases showed that different model formats are being displayed using the same basic structure. Fixed for two discovered model formats. Also the data format changes slightly based on the amount of data supplied. Parser re-factored to account for varying line numbers.