Moved the rest of the parse code to the parse data model thang