Refactor section parser to handle any section ordering, even if there are missing sections. Missing full test coverage yet.
Test catch up