Refactored, added (not yet working) StrictParser