Things were getting a bit complicated and slow with the old parser so I decided to continue #44's work on the main codebase.