New parser. Final
All tests passing