Parser now works (at least for valid data)