Marked up the parser in some important places to help us find were declarations are happening
Merge branches 'master' and 'parser/comments'