Finished move to inherited AST structure
Fixed issue with defaul initialization