Major Parser update - 11/11 tests passing