Add parse tracking, fixes #1