Dummy commenting
Fixes inheritance
Merge branch 'compiler3.0_tmp' into compiler3.0
Some work on parser