New parser - work in progress
New templates almost work correctly; only filters left
Merge pull request #1 from cosmi/newparser

Newparser