Revert "Revert "Added basic parsing functionality""

This reverts commit 95a2975eaeab92a3d7d427798305e908dba7be50.