Revert "Revert "Revert "Both parsers working"""

This reverts commit 04924a6ceb5267b1d1c90a4443b1163a80267789.