Initial Reworking

Starting to rework the parser to work with the new code.