Code Review Part 3 - Splitting parsing and generic - 3 of ?

In this I start to work on the parsing code, fixing it up and changing the arguments to be more generic to be more adaptable to testing.