diff --git a/pom.xml b/pom.xml
index 56e3a49..5e02a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,4 +14,19 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.17.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.13.1</version>
+        </dependency>
+    </dependencies>
+
+
 </project>
\ No newline at end of file
diff --git a/src/grammars/Winx.g4 b/src/grammars/Winx.g4
index 7a75336..391db60 100644
--- a/src/grammars/Winx.g4
+++ b/src/grammars/Winx.g4
@@ -2,83 +2,74 @@ grammar Winx;
 
 // Lexer rules
 ID          : [a-zA-Z]+ ;
-STRING      : '"' ~'"'* '"' ;
-NEWLINE     : [\r\n]+ -> skip;
-COMMENT     : ('~' ~[~]*? '~') | ('//' ~[\r\n]* NEWLINE) ;
-WS          : [ \t\r\n]+ -> skip ;
 INT         : [0-9]+ ;
 FLOAT       : [0-9]+ '.' [0-9]* | '.' [0-9]+ ;
+STRING      : '"' ('\\' ["\\] | ~["\\])* '"';
+WS          : [ \t\r\n]+ -> skip ;
+
+// Flexible handling of comments
+COMMENT     : ('~' .*? '~') -> channel(HIDDEN);
+LINE_COMMENT: '//' ~[\r\n]* -> channel(HIDDEN);
 
 // Parser rules
+winx        : package+ ;
 
-winx                    :  (package | COMMENT)+;
+package     : 'package' ID '{' body '}' ;
 
-body                    : (interface | specification| COMMENT)+ ;
+body        : (interface | specification)* ;
 
-// Hierarchies
+interface   : importance? 'interface' ID '{' spec_body '}' ;
 
-package                 : 'package' ID '{' body '}' ;
+specification: 'specification' ID impls? '{' spec_body '}' ;
 
-interface               : importance? access_modifiers? 'interface' ID '{' spec_body '}' ;
+impls : ('implements' ID) ;
 
-specification           : 'specification' ID ('implements' ID)? '{' spec_body '}' ;
+spec_body   : (requirement_spec | function_spec)* ;
 
-spec_body               : (requirement_spec | function_spec)+ ;
+requirement_spec: importance? ID '{' req_specification* result_specification* '}' ;
 
+req_specification: importance? '@' ID (logical_op ID)* ';' ;
 
+result_specification: 'result' importance? ID ';' ;
 
-// Non-functional Requirements
+function_spec: importance? access_modifiers? ID '(' input_types? ')' impls? function_body ;
 
-requirement_spec        : comment? importance? ID '{' req_specification* result_specification* '}' ;
+function_body: '{' specification_entry* return_type '}';
 
-req_specification       : comment? importance? '@' ID (logical_op ID)* ';' ;
+input_types  : variable (',' variable)* ;
 
-result_specification    : comment? 'result' importance? ID ';' ;
+return_type : 'return' variable ';' ;
 
-logical_op              : 'AND' | 'OR' ;
+specification_entry: '@' ID ':' STRING ';' ;
 
-// Functional Requirements
+variable    : type '[]'? ID;
 
-function_spec            : comment? importance? access_modifiers? ID'(' input_types? ')' ('implements' ID)? function_body;
+importance  : 'critical' | 'optional' ;
 
-function_body            : '{' specification_entry* return_types '}';
+type        : 'INT'
+            | 'FLOAT'
+            | 'DOUBLE'
+            | 'STRING'
+            | 'BOOLEAN'
+            | 'CHAR'
+            | 'VOID'
+            | STRING;
 
-input_types              : variable (',' variable)* ;
-
-return_types             : 'return' variable (',' variable)* ';' ;
-
-specification_entry      : comment? '@' ID ':'STRING';';
-
-// General Rules
-
-variable                : type '[]'? ID;
-
-importance              : 'critical' | 'optional' ;
-
-type                    : 'INT'
-                        | 'FLOAT'
-                        | 'DOUBLE'
-                        | 'STRING'
-                        | 'BOOLEAN'
-                        | 'CHAR'
-                        | 'VOID'
-                        | STRING;
-
-access_modifiers        : 'public'
-                        | 'protected'
-                        | 'private'
-                        | 'default';
-
-comment                 : COMMENT;
+access_modifiers: 'public'
+                | 'protected'
+                | 'private'
+                | 'default';
 
+// Logical operators if needed for parsing complexity within annotations
+logical_op  : 'AND' | 'OR';
 
 // Symbols
-LPAREN                  : '(' ;
-RPAREN                  : ')' ;
-COLON                   : ':' ;
-SEMICOLON               : ';' ;
-COMMA                   : ',' ;
-LBRACE                  : '{' ;
-RBRACE                  : '}' ;
-TILDE                   : '~' ;
-EXCLAM                  : '!' ;
+LPAREN      : '(';
+RPAREN      : ')';
+COLON       : ':';
+SEMICOLON   : ';';
+COMMA       : ',';
+LBRACE      : '{';
+RBRACE      : '}';
+TILDE       : '~';
+EXCLAM      : '!';
diff --git a/src/main/java/org/lumijiez/Main.java b/src/main/java/org/lumijiez/Main.java
index 17718cf..6038637 100644
--- a/src/main/java/org/lumijiez/Main.java
+++ b/src/main/java/org/lumijiez/Main.java
@@ -1,37 +1,54 @@
 package org.lumijiez;
 
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.lumijiez.parser.WinxBaseListener;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.lumijiez.models.Package;
 import org.lumijiez.parser.WinxLexer;
 import org.lumijiez.parser.WinxParser;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Objects;
 
 public class Main {
-    public static void main(String[] args) throws IOException, URISyntaxException {
-        String input = new String(Files.readAllBytes(Path.of(Objects.requireNonNull(Main.class.getResource("/TestProgram.txt")).toURI())));
+    public static void main(String[] args) {
+        try {
+            // Load the input from a resource file
+            Path inputPath = Path.of(Objects.requireNonNull(Main.class.getResource("/TestProgram.txt")).toURI());
+            String input = Files.readString(inputPath);
 
-        CharStream inputStream = CharStreams.fromString(input);
-        WinxLexer lexer = new WinxLexer(inputStream);
-        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
-        WinxParser parser = new WinxParser(tokenStream);
+            // Initialize ANTLR components
+            CharStream inputStream = CharStreams.fromString(input);
+            WinxLexer lexer = new WinxLexer(inputStream);
+            CommonTokenStream tokenStream = new CommonTokenStream(lexer);
+            WinxParser parser = new WinxParser(tokenStream);
 
-        ParseTreeWalker walker = new ParseTreeWalker();
-        SoftwareReqParseTree listener = new SoftwareReqParseTree();
-        walker.walk(listener, parser.winx());
-    }
+            // Parsing the input
+            ParseTree tree = parser.winx();
 
-    static class SoftwareReqParseTree extends WinxBaseListener {
-        @Override
-        public void enterWinx(WinxParser.WinxContext ctx) {
-            System.out.println("Parsed! \n\n" + ctx.getText());
+            // Creating and using the collector to process the parse tree
+            WinxCollector collector = new WinxCollector();
+            collector.visit(tree);
+
+            // Retrieve the collected data and save it to JSON
+            List<Package> packages = collector.getPackages();
+            saveAsJson(packages, "output.json");
+
+            System.out.println("Data successfully saved to 'output.json'.");
+        } catch (IOException | URISyntaxException e) {
+            System.err.println("Error processing the input file: " + e.getMessage());
         }
     }
-}
\ No newline at end of file
+
+    private static void saveAsJson(List<Package> packages, String filePath) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        // Write JSON output to a file with pretty printing
+        mapper.writerWithDefaultPrettyPrinter().writeValue(new File(filePath), packages);
+    }
+}
diff --git a/src/main/java/org/lumijiez/WinxCollector.java b/src/main/java/org/lumijiez/WinxCollector.java
new file mode 100644
index 0000000..3b23a5e
--- /dev/null
+++ b/src/main/java/org/lumijiez/WinxCollector.java
@@ -0,0 +1,106 @@
+package org.lumijiez;
+
+import org.lumijiez.models.*;
+import org.lumijiez.models.Package;
+import org.lumijiez.parser.WinxBaseVisitor;
+import org.lumijiez.parser.WinxParser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WinxCollector extends WinxBaseVisitor<Void> {
+    private final List<Package> packages = new ArrayList<>();
+    private Package currentPackage;
+    private Specification currentSpecification;
+    private Interface currentInterface;
+
+    @Override
+    public Void visitPackage(WinxParser.PackageContext ctx) {
+        String packageName = ctx.ID().getText();
+        currentPackage = new Package(packageName);
+        visitChildren(ctx);  // Recursively visit children to fill the package
+        packages.add(currentPackage);
+        currentPackage = null;  // Reset after finishing this package
+        return null;
+    }
+
+    @Override
+    public Void visitInterface(WinxParser.InterfaceContext ctx) {
+        String interfaceName = ctx.ID().getText();
+        currentInterface = new Interface(interfaceName);
+        visitChildren(ctx);  // Recursively visit children to fill the interface
+        currentPackage.addInterface(currentInterface);
+        currentInterface = null;  // Reset after finishing this interface
+        return null;
+    }
+
+    @Override
+    public Void visitSpecification(WinxParser.SpecificationContext ctx) {
+        String specificationName = ctx.ID().getText();
+        currentSpecification = new Specification(specificationName);
+        if (ctx.impls() != null) {
+            currentSpecification.setImplementedInterface(ctx.impls().ID().getText());
+        }
+        visitChildren(ctx);
+        currentPackage.addSpecification(currentSpecification);
+        currentSpecification = null;
+        return null;
+    }
+
+    @Override
+    public Void visitFunction_spec(WinxParser.Function_specContext ctx) {
+        String functionName = ctx.ID().getText();
+        FunctionSpec function = new FunctionSpec(functionName);
+        if (ctx.input_types() != null) {
+            ctx.input_types().variable().forEach(v -> function.addInputType(new Variable(v.type().getText(), v.ID().getText())));
+        }
+
+        function.addReturnType(new Variable(ctx.function_body().return_type().variable().type().getText(), ctx.function_body().return_type().variable().ID().getText()));
+
+        if (ctx.impls() != null) function.setImplemented_interface(ctx.impls().ID().getText());
+
+        if (ctx.function_body().specification_entry() != null)
+            ctx.function_body().specification_entry().forEach(
+                    se -> function.addSpecificationEntry(new SpecificationEntry(se.ID().getText(), se.STRING().getText())));
+
+        function.setAccess_modifier(ctx.access_modifiers().getText());
+        if (currentInterface != null) {
+            currentInterface.addFunction(function);
+        } else if (currentSpecification != null) {
+            currentSpecification.addFunction(function);
+        }
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Void visitRequirement_spec(WinxParser.Requirement_specContext ctx) {
+        RequirementSpec requirement = new RequirementSpec(ctx.ID().getText());
+        ctx.req_specification().forEach(rs -> requirement.addAnnotation(
+                new Spec(rs.ID(0).getText(), rs.importance().getText())
+        ));
+        if (currentSpecification != null) {
+            currentSpecification.addRequirement(requirement);
+        }
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Void visitResult_specification(WinxParser.Result_specificationContext ctx) {
+        ResultSpecification result;
+
+        if (ctx.importance() != null) {
+            result = new ResultSpecification(ctx.ID().getText(), ctx.importance().getText());
+        } else {
+            result = new ResultSpecification(ctx.ID().getText());
+        }
+
+        if (currentSpecification != null) {
+            currentSpecification.addResult(result);
+        }
+        return visitChildren(ctx);
+    }
+
+    public List<Package> getPackages() {
+        return packages;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/FunctionSpec.java b/src/main/java/org/lumijiez/models/FunctionSpec.java
new file mode 100644
index 0000000..0f760c4
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/FunctionSpec.java
@@ -0,0 +1,61 @@
+package org.lumijiez.models;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionSpec {
+    private final String name;
+    private String access_modifier;
+    private String implemented_interface = "none";
+    private final List<Variable> inputTypes = new ArrayList<>();
+    private final List<Variable> returnTypes = new ArrayList<>();
+    private final List<SpecificationEntry> specificationEntries = new ArrayList<>();
+
+    public FunctionSpec(String name) {
+        this.name = name;
+    }
+
+    public void addInputType(Variable inputType) {
+        inputTypes.add(inputType);
+    }
+
+    public void addReturnType(Variable returnType) {
+        returnTypes.add(returnType);
+    }
+
+    public void addSpecificationEntry(SpecificationEntry entry) {
+        specificationEntries.add(entry);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Variable> getInputTypes() {
+        return inputTypes;
+    }
+
+    public List<Variable> getReturnTypes() {
+        return returnTypes;
+    }
+
+    public List<SpecificationEntry> getSpecificationEntries() {
+        return specificationEntries;
+    }
+
+    public String getAccess_modifier() {
+        return access_modifier;
+    }
+
+    public void setAccess_modifier(String access_modifier) {
+        this.access_modifier = access_modifier;
+    }
+
+    public String getImplemented_interface() {
+        return implemented_interface;
+    }
+
+    public void setImplemented_interface(String implemented_interface) {
+        this.implemented_interface = implemented_interface;
+    }
+}
+
diff --git a/src/main/java/org/lumijiez/models/Interface.java b/src/main/java/org/lumijiez/models/Interface.java
new file mode 100644
index 0000000..7cd9863
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/Interface.java
@@ -0,0 +1,25 @@
+package org.lumijiez.models;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Interface {
+    private final String name;
+    private final List<FunctionSpec> functions = new ArrayList<>();
+
+    public Interface(String name) {
+        this.name = name;
+    }
+
+    public void addFunction(FunctionSpec function) {
+        functions.add(function);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<FunctionSpec> getFunctions() {
+        return functions;
+    }
+}
+
diff --git a/src/main/java/org/lumijiez/models/Package.java b/src/main/java/org/lumijiez/models/Package.java
new file mode 100644
index 0000000..3027f2c
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/Package.java
@@ -0,0 +1,34 @@
+package org.lumijiez.models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Package {
+    private final String name;
+    private final List<Interface> interfaces = new ArrayList<>();
+    private final List<Specification> specifications = new ArrayList<>();
+
+    public Package(String name) {
+        this.name = name;
+    }
+
+    public void addInterface(Interface iface) {
+        interfaces.add(iface);
+    }
+
+    public void addSpecification(Specification spec) {
+        specifications.add(spec);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Interface> getInterfaces() {
+        return interfaces;
+    }
+
+    public List<Specification> getSpecifications() {
+        return specifications;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/RequirementSpec.java b/src/main/java/org/lumijiez/models/RequirementSpec.java
new file mode 100644
index 0000000..1a34400
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/RequirementSpec.java
@@ -0,0 +1,26 @@
+package org.lumijiez.models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RequirementSpec {
+    private final String name;
+    private final List<Spec> specs = new ArrayList<>();
+
+    public RequirementSpec(String name) {
+        this.name = name;
+    }
+
+    public void addAnnotation(Spec spec) {
+        specs.add(spec);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Spec> getAnnotations() {
+        return specs;
+    }
+}
+
diff --git a/src/main/java/org/lumijiez/models/ResultSpecification.java b/src/main/java/org/lumijiez/models/ResultSpecification.java
new file mode 100644
index 0000000..4b04885
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/ResultSpecification.java
@@ -0,0 +1,24 @@
+package org.lumijiez.models;
+
+public class ResultSpecification {
+    private final String name;
+    private final String importance;
+
+    public ResultSpecification(String name) {
+        this.name = name;
+        this.importance = "none";
+    }
+
+    public ResultSpecification(String name, String importance) {
+        this.name = name;
+        this.importance = importance;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImportance() {
+        return importance;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/Spec.java b/src/main/java/org/lumijiez/models/Spec.java
new file mode 100644
index 0000000..63abe4d
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/Spec.java
@@ -0,0 +1,27 @@
+package org.lumijiez.models;
+
+public class Spec {
+    private String importance;
+    private String name;
+
+    public Spec(String name, String importance) {
+        this.setImportance(importance);
+        this.setName(name);
+    }
+
+    public String getImportance() {
+        return importance;
+    }
+
+    public void setImportance(String importance) {
+        this.importance = importance;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/Specification.java b/src/main/java/org/lumijiez/models/Specification.java
new file mode 100644
index 0000000..9abae82
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/Specification.java
@@ -0,0 +1,51 @@
+package org.lumijiez.models;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Specification {
+    private final String name;
+    public String implemented_interface = "none";
+    private final List<RequirementSpec> requirements = new ArrayList<>();
+    private final List<ResultSpecification> results = new ArrayList<>();
+    private final List<FunctionSpec> functions = new ArrayList<>();
+
+    public Specification(String name) {
+        this.name = name;
+    }
+
+    public void addRequirement(RequirementSpec requirement) {
+        requirements.add(requirement);
+    }
+
+    public void addResult(ResultSpecification result) {
+        results.add(result);
+    }
+
+    public void addFunction(FunctionSpec function) {
+        functions.add(function);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<RequirementSpec> getRequirements() {
+        return requirements;
+    }
+
+    public List<ResultSpecification> getResults() {
+        return results;
+    }
+
+    public List<FunctionSpec> getFunctions() {
+        return functions;
+    }
+
+    public String getImplementedInterface() {
+        return implemented_interface;
+    }
+
+    public void setImplementedInterface(String implemented_interface) {
+        this.implemented_interface = implemented_interface;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/SpecificationEntry.java b/src/main/java/org/lumijiez/models/SpecificationEntry.java
new file mode 100644
index 0000000..bd307fc
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/SpecificationEntry.java
@@ -0,0 +1,19 @@
+package org.lumijiez.models;
+
+public class SpecificationEntry {
+    private final String key;
+    private final String value;
+
+    public SpecificationEntry(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/org/lumijiez/models/Variable.java b/src/main/java/org/lumijiez/models/Variable.java
new file mode 100644
index 0000000..5d249c2
--- /dev/null
+++ b/src/main/java/org/lumijiez/models/Variable.java
@@ -0,0 +1,19 @@
+package org.lumijiez.models;
+
+public class Variable {
+    private final String type;
+    private final String identifier;
+
+    public Variable(String type, String identifier) {
+        this.type = type;
+        this.identifier = identifier;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+}
diff --git a/src/main/java/org/lumijiez/parser/Winx.interp b/src/main/java/org/lumijiez/parser/Winx.interp
index 44bedaf..74c4776 100644
--- a/src/main/java/org/lumijiez/parser/Winx.interp
+++ b/src/main/java/org/lumijiez/parser/Winx.interp
@@ -6,8 +6,6 @@ null
 'implements'
 '@'
 'result'
-'AND'
-'OR'
 'return'
 '[]'
 'critical'
@@ -23,6 +21,8 @@ null
 'protected'
 'private'
 'default'
+'AND'
+'OR'
 null
 null
 null
@@ -66,12 +66,12 @@ null
 null
 null
 ID
-STRING
-NEWLINE
-COMMENT
-WS
 INT
 FLOAT
+STRING
+WS
+COMMENT
+LINE_COMMENT
 LPAREN
 RPAREN
 COLON
@@ -84,26 +84,26 @@ EXCLAM
 
 rule names:
 winx
-body
 package
+body
 interface
 specification
+impls
 spec_body
 requirement_spec
 req_specification
 result_specification
-logical_op
 function_spec
 function_body
 input_types
-return_types
+return_type
 specification_entry
 variable
 importance
 type
 access_modifiers
-comment
+logical_op
 
 
 atn:
-[4, 1, 39, 213, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 1, 0, 1, 0, 4, 0, 43, 8, 0, 11, 0, 12, 0, 44, 1, 1, 1, 1, 1, 1, 4, 1, 50, 8, 1, 11, 1, 12, 1, 51, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 3, 3, 61, 8, 3, 1, 3, 3, 3, 64, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 76, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 4, 5, 84, 8, 5, 11, 5, 12, 5, 85, 1, 6, 3, 6, 89, 8, 6, 1, 6, 3, 6, 92, 8, 6, 1, 6, 1, 6, 1, 6, 5, 6, 97, 8, 6, 10, 6, 12, 6, 100, 9, 6, 1, 6, 5, 6, 103, 8, 6, 10, 6, 12, 6, 106, 9, 6, 1, 6, 1, 6, 1, 7, 3, 7, 111, 8, 7, 1, 7, 3, 7, 114, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 121, 8, 7, 10, 7, 12, 7, 124, 9, 7, 1, 7, 1, 7, 1, 8, 3, 8, 129, 8, 8, 1, 8, 1, 8, 3, 8, 133, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 3, 10, 141, 8, 10, 1, 10, 3, 10, 144, 8, 10, 1, 10, 3, 10, 147, 8, 10, 1, 10, 1, 10, 1, 10, 3, 10, 152, 8, 10, 1, 10, 1, 10, 1, 10, 3, 10, 157, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 5, 11, 163, 8, 11, 10, 11, 12, 11, 166, 9, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 174, 8, 12, 10, 12, 12, 12, 177, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 5, 13, 183, 8, 13, 10, 13, 12, 13, 186, 9, 13, 1, 13, 1, 13, 1, 14, 3, 14, 191, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 3, 15, 201, 8, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 0, 0, 20, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 0, 4, 1, 0, 7, 8, 1, 0, 11, 12, 2, 0, 13, 19, 25, 25, 1, 0, 20, 23, 221, 0, 42, 1, 0, 0, 0, 2, 49, 1, 0, 0, 0, 4, 53, 1, 0, 0, 0, 6, 60, 1, 0, 0, 0, 8, 71, 1, 0, 0, 0, 10, 83, 1, 0, 0, 0, 12, 88, 1, 0, 0, 0, 14, 110, 1, 0, 0, 0, 16, 128, 1, 0, 0, 0, 18, 137, 1, 0, 0, 0, 20, 140, 1, 0, 0, 0, 22, 160, 1, 0, 0, 0, 24, 170, 1, 0, 0, 0, 26, 178, 1, 0, 0, 0, 28, 190, 1, 0, 0, 0, 30, 198, 1, 0, 0, 0, 32, 204, 1, 0, 0, 0, 34, 206, 1, 0, 0, 0, 36, 208, 1, 0, 0, 0, 38, 210, 1, 0, 0, 0, 40, 43, 3, 4, 2, 0, 41, 43, 5, 27, 0, 0, 42, 40, 1, 0, 0, 0, 42, 41, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 1, 1, 0, 0, 0, 46, 50, 3, 6, 3, 0, 47, 50, 3, 8, 4, 0, 48, 50, 5, 27, 0, 0, 49, 46, 1, 0, 0, 0, 49, 47, 1, 0, 0, 0, 49, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 3, 1, 0, 0, 0, 53, 54, 5, 1, 0, 0, 54, 55, 5, 24, 0, 0, 55, 56, 5, 36, 0, 0, 56, 57, 3, 2, 1, 0, 57, 58, 5, 37, 0, 0, 58, 5, 1, 0, 0, 0, 59, 61, 3, 32, 16, 0, 60, 59, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 63, 1, 0, 0, 0, 62, 64, 3, 36, 18, 0, 63, 62, 1, 0, 0, 0, 63, 64, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 66, 5, 2, 0, 0, 66, 67, 5, 24, 0, 0, 67, 68, 5, 36, 0, 0, 68, 69, 3, 10, 5, 0, 69, 70, 5, 37, 0, 0, 70, 7, 1, 0, 0, 0, 71, 72, 5, 3, 0, 0, 72, 75, 5, 24, 0, 0, 73, 74, 5, 4, 0, 0, 74, 76, 5, 24, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 77, 1, 0, 0, 0, 77, 78, 5, 36, 0, 0, 78, 79, 3, 10, 5, 0, 79, 80, 5, 37, 0, 0, 80, 9, 1, 0, 0, 0, 81, 84, 3, 12, 6, 0, 82, 84, 3, 20, 10, 0, 83, 81, 1, 0, 0, 0, 83, 82, 1, 0, 0, 0, 84, 85, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 11, 1, 0, 0, 0, 87, 89, 3, 38, 19, 0, 88, 87, 1, 0, 0, 0, 88, 89, 1, 0, 0, 0, 89, 91, 1, 0, 0, 0, 90, 92, 3, 32, 16, 0, 91, 90, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 94, 5, 24, 0, 0, 94, 98, 5, 36, 0, 0, 95, 97, 3, 14, 7, 0, 96, 95, 1, 0, 0, 0, 97, 100, 1, 0, 0, 0, 98, 96, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 104, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 101, 103, 3, 16, 8, 0, 102, 101, 1, 0, 0, 0, 103, 106, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 107, 1, 0, 0, 0, 106, 104, 1, 0, 0, 0, 107, 108, 5, 37, 0, 0, 108, 13, 1, 0, 0, 0, 109, 111, 3, 38, 19, 0, 110, 109, 1, 0, 0, 0, 110, 111, 1, 0, 0, 0, 111, 113, 1, 0, 0, 0, 112, 114, 3, 32, 16, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 5, 0, 0, 116, 122, 5, 24, 0, 0, 117, 118, 3, 18, 9, 0, 118, 119, 5, 24, 0, 0, 119, 121, 1, 0, 0, 0, 120, 117, 1, 0, 0, 0, 121, 124, 1, 0, 0, 0, 122, 120, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 125, 1, 0, 0, 0, 124, 122, 1, 0, 0, 0, 125, 126, 5, 34, 0, 0, 126, 15, 1, 0, 0, 0, 127, 129, 3, 38, 19, 0, 128, 127, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 132, 5, 6, 0, 0, 131, 133, 3, 32, 16, 0, 132, 131, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 135, 5, 24, 0, 0, 135, 136, 5, 34, 0, 0, 136, 17, 1, 0, 0, 0, 137, 138, 7, 0, 0, 0, 138, 19, 1, 0, 0, 0, 139, 141, 3, 38, 19, 0, 140, 139, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 143, 1, 0, 0, 0, 142, 144, 3, 32, 16, 0, 143, 142, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 146, 1, 0, 0, 0, 145, 147, 3, 36, 18, 0, 146, 145, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 149, 5, 24, 0, 0, 149, 151, 5, 31, 0, 0, 150, 152, 3, 24, 12, 0, 151, 150, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 156, 5, 32, 0, 0, 154, 155, 5, 4, 0, 0, 155, 157, 5, 24, 0, 0, 156, 154, 1, 0, 0, 0, 156, 157, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 159, 3, 22, 11, 0, 159, 21, 1, 0, 0, 0, 160, 164, 5, 36, 0, 0, 161, 163, 3, 28, 14, 0, 162, 161, 1, 0, 0, 0, 163, 166, 1, 0, 0, 0, 164, 162, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 167, 1, 0, 0, 0, 166, 164, 1, 0, 0, 0, 167, 168, 3, 26, 13, 0, 168, 169, 5, 37, 0, 0, 169, 23, 1, 0, 0, 0, 170, 175, 3, 30, 15, 0, 171, 172, 5, 35, 0, 0, 172, 174, 3, 30, 15, 0, 173, 171, 1, 0, 0, 0, 174, 177, 1, 0, 0, 0, 175, 173, 1, 0, 0, 0, 175, 176, 1, 0, 0, 0, 176, 25, 1, 0, 0, 0, 177, 175, 1, 0, 0, 0, 178, 179, 5, 9, 0, 0, 179, 184, 3, 30, 15, 0, 180, 181, 5, 35, 0, 0, 181, 183, 3, 30, 15, 0, 182, 180, 1, 0, 0, 0, 183, 186, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 184, 185, 1, 0, 0, 0, 185, 187, 1, 0, 0, 0, 186, 184, 1, 0, 0, 0, 187, 188, 5, 34, 0, 0, 188, 27, 1, 0, 0, 0, 189, 191, 3, 38, 19, 0, 190, 189, 1, 0, 0, 0, 190, 191, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 193, 5, 5, 0, 0, 193, 194, 5, 24, 0, 0, 194, 195, 5, 33, 0, 0, 195, 196, 5, 25, 0, 0, 196, 197, 5, 34, 0, 0, 197, 29, 1, 0, 0, 0, 198, 200, 3, 34, 17, 0, 199, 201, 5, 10, 0, 0, 200, 199, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 203, 5, 24, 0, 0, 203, 31, 1, 0, 0, 0, 204, 205, 7, 1, 0, 0, 205, 33, 1, 0, 0, 0, 206, 207, 7, 2, 0, 0, 207, 35, 1, 0, 0, 0, 208, 209, 7, 3, 0, 0, 209, 37, 1, 0, 0, 0, 210, 211, 5, 27, 0, 0, 211, 39, 1, 0, 0, 0, 28, 42, 44, 49, 51, 60, 63, 75, 83, 85, 88, 91, 98, 104, 110, 113, 122, 128, 132, 140, 143, 146, 151, 156, 164, 175, 184, 190, 200]
\ No newline at end of file
+[4, 1, 39, 187, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 1, 0, 4, 0, 42, 8, 0, 11, 0, 12, 0, 43, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 5, 2, 54, 8, 2, 10, 2, 12, 2, 57, 9, 2, 1, 3, 3, 3, 60, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 3, 4, 71, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 5, 6, 82, 8, 6, 10, 6, 12, 6, 85, 9, 6, 1, 7, 3, 7, 88, 8, 7, 1, 7, 1, 7, 1, 7, 5, 7, 93, 8, 7, 10, 7, 12, 7, 96, 9, 7, 1, 7, 5, 7, 99, 8, 7, 10, 7, 12, 7, 102, 9, 7, 1, 7, 1, 7, 1, 8, 3, 8, 107, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 114, 8, 8, 10, 8, 12, 8, 117, 9, 8, 1, 8, 1, 8, 1, 9, 1, 9, 3, 9, 123, 8, 9, 1, 9, 1, 9, 1, 9, 1, 10, 3, 10, 129, 8, 10, 1, 10, 3, 10, 132, 8, 10, 1, 10, 1, 10, 1, 10, 3, 10, 137, 8, 10, 1, 10, 1, 10, 3, 10, 141, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 5, 11, 147, 8, 11, 10, 11, 12, 11, 150, 9, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 158, 8, 12, 10, 12, 12, 12, 161, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 3, 15, 175, 8, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 0, 0, 20, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 0, 4, 1, 0, 9, 10, 2, 0, 11, 17, 27, 27, 1, 0, 18, 21, 1, 0, 22, 23, 186, 0, 41, 1, 0, 0, 0, 2, 45, 1, 0, 0, 0, 4, 55, 1, 0, 0, 0, 6, 59, 1, 0, 0, 0, 8, 67, 1, 0, 0, 0, 10, 76, 1, 0, 0, 0, 12, 83, 1, 0, 0, 0, 14, 87, 1, 0, 0, 0, 16, 106, 1, 0, 0, 0, 18, 120, 1, 0, 0, 0, 20, 128, 1, 0, 0, 0, 22, 144, 1, 0, 0, 0, 24, 154, 1, 0, 0, 0, 26, 162, 1, 0, 0, 0, 28, 166, 1, 0, 0, 0, 30, 172, 1, 0, 0, 0, 32, 178, 1, 0, 0, 0, 34, 180, 1, 0, 0, 0, 36, 182, 1, 0, 0, 0, 38, 184, 1, 0, 0, 0, 40, 42, 3, 2, 1, 0, 41, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 41, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 1, 1, 0, 0, 0, 45, 46, 5, 1, 0, 0, 46, 47, 5, 24, 0, 0, 47, 48, 5, 36, 0, 0, 48, 49, 3, 4, 2, 0, 49, 50, 5, 37, 0, 0, 50, 3, 1, 0, 0, 0, 51, 54, 3, 6, 3, 0, 52, 54, 3, 8, 4, 0, 53, 51, 1, 0, 0, 0, 53, 52, 1, 0, 0, 0, 54, 57, 1, 0, 0, 0, 55, 53, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 5, 1, 0, 0, 0, 57, 55, 1, 0, 0, 0, 58, 60, 3, 32, 16, 0, 59, 58, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 62, 5, 2, 0, 0, 62, 63, 5, 24, 0, 0, 63, 64, 5, 36, 0, 0, 64, 65, 3, 12, 6, 0, 65, 66, 5, 37, 0, 0, 66, 7, 1, 0, 0, 0, 67, 68, 5, 3, 0, 0, 68, 70, 5, 24, 0, 0, 69, 71, 3, 10, 5, 0, 70, 69, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 72, 1, 0, 0, 0, 72, 73, 5, 36, 0, 0, 73, 74, 3, 12, 6, 0, 74, 75, 5, 37, 0, 0, 75, 9, 1, 0, 0, 0, 76, 77, 5, 4, 0, 0, 77, 78, 5, 24, 0, 0, 78, 11, 1, 0, 0, 0, 79, 82, 3, 14, 7, 0, 80, 82, 3, 20, 10, 0, 81, 79, 1, 0, 0, 0, 81, 80, 1, 0, 0, 0, 82, 85, 1, 0, 0, 0, 83, 81, 1, 0, 0, 0, 83, 84, 1, 0, 0, 0, 84, 13, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 86, 88, 3, 32, 16, 0, 87, 86, 1, 0, 0, 0, 87, 88, 1, 0, 0, 0, 88, 89, 1, 0, 0, 0, 89, 90, 5, 24, 0, 0, 90, 94, 5, 36, 0, 0, 91, 93, 3, 16, 8, 0, 92, 91, 1, 0, 0, 0, 93, 96, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 94, 95, 1, 0, 0, 0, 95, 100, 1, 0, 0, 0, 96, 94, 1, 0, 0, 0, 97, 99, 3, 18, 9, 0, 98, 97, 1, 0, 0, 0, 99, 102, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 103, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 103, 104, 5, 37, 0, 0, 104, 15, 1, 0, 0, 0, 105, 107, 3, 32, 16, 0, 106, 105, 1, 0, 0, 0, 106, 107, 1, 0, 0, 0, 107, 108, 1, 0, 0, 0, 108, 109, 5, 5, 0, 0, 109, 115, 5, 24, 0, 0, 110, 111, 3, 38, 19, 0, 111, 112, 5, 24, 0, 0, 112, 114, 1, 0, 0, 0, 113, 110, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 115, 116, 1, 0, 0, 0, 116, 118, 1, 0, 0, 0, 117, 115, 1, 0, 0, 0, 118, 119, 5, 34, 0, 0, 119, 17, 1, 0, 0, 0, 120, 122, 5, 6, 0, 0, 121, 123, 3, 32, 16, 0, 122, 121, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 125, 5, 24, 0, 0, 125, 126, 5, 34, 0, 0, 126, 19, 1, 0, 0, 0, 127, 129, 3, 32, 16, 0, 128, 127, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 131, 1, 0, 0, 0, 130, 132, 3, 36, 18, 0, 131, 130, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 5, 24, 0, 0, 134, 136, 5, 31, 0, 0, 135, 137, 3, 24, 12, 0, 136, 135, 1, 0, 0, 0, 136, 137, 1, 0, 0, 0, 137, 138, 1, 0, 0, 0, 138, 140, 5, 32, 0, 0, 139, 141, 3, 10, 5, 0, 140, 139, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 3, 22, 11, 0, 143, 21, 1, 0, 0, 0, 144, 148, 5, 36, 0, 0, 145, 147, 3, 28, 14, 0, 146, 145, 1, 0, 0, 0, 147, 150, 1, 0, 0, 0, 148, 146, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 151, 1, 0, 0, 0, 150, 148, 1, 0, 0, 0, 151, 152, 3, 26, 13, 0, 152, 153, 5, 37, 0, 0, 153, 23, 1, 0, 0, 0, 154, 159, 3, 30, 15, 0, 155, 156, 5, 35, 0, 0, 156, 158, 3, 30, 15, 0, 157, 155, 1, 0, 0, 0, 158, 161, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 159, 160, 1, 0, 0, 0, 160, 25, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 162, 163, 5, 7, 0, 0, 163, 164, 3, 30, 15, 0, 164, 165, 5, 34, 0, 0, 165, 27, 1, 0, 0, 0, 166, 167, 5, 5, 0, 0, 167, 168, 5, 24, 0, 0, 168, 169, 5, 33, 0, 0, 169, 170, 5, 27, 0, 0, 170, 171, 5, 34, 0, 0, 171, 29, 1, 0, 0, 0, 172, 174, 3, 34, 17, 0, 173, 175, 5, 8, 0, 0, 174, 173, 1, 0, 0, 0, 174, 175, 1, 0, 0, 0, 175, 176, 1, 0, 0, 0, 176, 177, 5, 24, 0, 0, 177, 31, 1, 0, 0, 0, 178, 179, 7, 0, 0, 0, 179, 33, 1, 0, 0, 0, 180, 181, 7, 1, 0, 0, 181, 35, 1, 0, 0, 0, 182, 183, 7, 2, 0, 0, 183, 37, 1, 0, 0, 0, 184, 185, 7, 3, 0, 0, 185, 39, 1, 0, 0, 0, 20, 43, 53, 55, 59, 70, 81, 83, 87, 94, 100, 106, 115, 122, 128, 131, 136, 140, 148, 159, 174]
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/Winx.tokens b/src/main/java/org/lumijiez/parser/Winx.tokens
index 811296c..044435d 100644
--- a/src/main/java/org/lumijiez/parser/Winx.tokens
+++ b/src/main/java/org/lumijiez/parser/Winx.tokens
@@ -22,12 +22,12 @@ T__20=21
 T__21=22
 T__22=23
 ID=24
-STRING=25
-NEWLINE=26
-COMMENT=27
+INT=25
+FLOAT=26
+STRING=27
 WS=28
-INT=29
-FLOAT=30
+COMMENT=29
+LINE_COMMENT=30
 LPAREN=31
 RPAREN=32
 COLON=33
@@ -43,23 +43,23 @@ EXCLAM=39
 'implements'=4
 '@'=5
 'result'=6
-'AND'=7
-'OR'=8
-'return'=9
-'[]'=10
-'critical'=11
-'optional'=12
-'INT'=13
-'FLOAT'=14
-'DOUBLE'=15
-'STRING'=16
-'BOOLEAN'=17
-'CHAR'=18
-'VOID'=19
-'public'=20
-'protected'=21
-'private'=22
-'default'=23
+'return'=7
+'[]'=8
+'critical'=9
+'optional'=10
+'INT'=11
+'FLOAT'=12
+'DOUBLE'=13
+'STRING'=14
+'BOOLEAN'=15
+'CHAR'=16
+'VOID'=17
+'public'=18
+'protected'=19
+'private'=20
+'default'=21
+'AND'=22
+'OR'=23
 '('=31
 ')'=32
 ':'=33
diff --git a/src/main/java/org/lumijiez/parser/WinxBaseListener.java b/src/main/java/org/lumijiez/parser/WinxBaseListener.java
index 66df728..a31c107 100644
--- a/src/main/java/org/lumijiez/parser/WinxBaseListener.java
+++ b/src/main/java/org/lumijiez/parser/WinxBaseListener.java
@@ -24,18 +24,6 @@ public class WinxBaseListener implements WinxListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitWinx(WinxParser.WinxContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBody(WinxParser.BodyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBody(WinxParser.BodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -48,6 +36,18 @@ public class WinxBaseListener implements WinxListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitPackage(WinxParser.PackageContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterBody(WinxParser.BodyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitBody(WinxParser.BodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -72,6 +72,18 @@ public class WinxBaseListener implements WinxListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitSpecification(WinxParser.SpecificationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterImpls(WinxParser.ImplsContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitImpls(WinxParser.ImplsContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -120,18 +132,6 @@ public class WinxBaseListener implements WinxListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitResult_specification(WinxParser.Result_specificationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLogical_op(WinxParser.Logical_opContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLogical_op(WinxParser.Logical_opContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -173,13 +173,13 @@ public class WinxBaseListener implements WinxListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterReturn_types(WinxParser.Return_typesContext ctx) { }
+	@Override public void enterReturn_type(WinxParser.Return_typeContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitReturn_types(WinxParser.Return_typesContext ctx) { }
+	@Override public void exitReturn_type(WinxParser.Return_typeContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -245,13 +245,13 @@ public class WinxBaseListener implements WinxListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterComment(WinxParser.CommentContext ctx) { }
+	@Override public void enterLogical_op(WinxParser.Logical_opContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitComment(WinxParser.CommentContext ctx) { }
+	@Override public void exitLogical_op(WinxParser.Logical_opContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
diff --git a/src/main/java/org/lumijiez/parser/WinxBaseVisitor.java b/src/main/java/org/lumijiez/parser/WinxBaseVisitor.java
index 8a5d178..c23c36c 100644
--- a/src/main/java/org/lumijiez/parser/WinxBaseVisitor.java
+++ b/src/main/java/org/lumijiez/parser/WinxBaseVisitor.java
@@ -25,14 +25,14 @@ public class WinxBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements W
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitBody(WinxParser.BodyContext ctx) { return visitChildren(ctx); }
+	@Override public T visitPackage(WinxParser.PackageContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitPackage(WinxParser.PackageContext ctx) { return visitChildren(ctx); }
+	@Override public T visitBody(WinxParser.BodyContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -47,6 +47,13 @@ public class WinxBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements W
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitSpecification(WinxParser.SpecificationContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitImpls(WinxParser.ImplsContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -75,13 +82,6 @@ public class WinxBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements W
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitResult_specification(WinxParser.Result_specificationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitLogical_op(WinxParser.Logical_opContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -109,7 +109,7 @@ public class WinxBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements W
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitReturn_types(WinxParser.Return_typesContext ctx) { return visitChildren(ctx); }
+	@Override public T visitReturn_type(WinxParser.Return_typeContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -151,5 +151,5 @@ public class WinxBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements W
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitComment(WinxParser.CommentContext ctx) { return visitChildren(ctx); }
+	@Override public T visitLogical_op(WinxParser.Logical_opContext ctx) { return visitChildren(ctx); }
 }
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/WinxLexer.interp b/src/main/java/org/lumijiez/parser/WinxLexer.interp
index c8aa3ba..451507a 100644
--- a/src/main/java/org/lumijiez/parser/WinxLexer.interp
+++ b/src/main/java/org/lumijiez/parser/WinxLexer.interp
@@ -6,8 +6,6 @@ null
 'implements'
 '@'
 'result'
-'AND'
-'OR'
 'return'
 '[]'
 'critical'
@@ -23,6 +21,8 @@ null
 'protected'
 'private'
 'default'
+'AND'
+'OR'
 null
 null
 null
@@ -66,12 +66,12 @@ null
 null
 null
 ID
-STRING
-NEWLINE
-COMMENT
-WS
 INT
 FLOAT
+STRING
+WS
+COMMENT
+LINE_COMMENT
 LPAREN
 RPAREN
 COLON
@@ -107,12 +107,12 @@ T__20
 T__21
 T__22
 ID
-STRING
-NEWLINE
-COMMENT
-WS
 INT
 FLOAT
+STRING
+WS
+COMMENT
+LINE_COMMENT
 LPAREN
 RPAREN
 COLON
@@ -131,4 +131,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[4, 0, 39, 332, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 4, 23, 243, 8, 23, 11, 23, 12, 23, 244, 1, 24, 1, 24, 5, 24, 249, 8, 24, 10, 24, 12, 24, 252, 9, 24, 1, 24, 1, 24, 1, 25, 4, 25, 257, 8, 25, 11, 25, 12, 25, 258, 1, 25, 1, 25, 1, 26, 1, 26, 5, 26, 265, 8, 26, 10, 26, 12, 26, 268, 9, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 275, 8, 26, 10, 26, 12, 26, 278, 9, 26, 1, 26, 3, 26, 281, 8, 26, 1, 27, 4, 27, 284, 8, 27, 11, 27, 12, 27, 285, 1, 27, 1, 27, 1, 28, 4, 28, 291, 8, 28, 11, 28, 12, 28, 292, 1, 29, 4, 29, 296, 8, 29, 11, 29, 12, 29, 297, 1, 29, 1, 29, 5, 29, 302, 8, 29, 10, 29, 12, 29, 305, 9, 29, 1, 29, 1, 29, 4, 29, 309, 8, 29, 11, 29, 12, 29, 310, 3, 29, 313, 8, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 266, 0, 39, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 1, 0, 6, 2, 0, 65, 90, 97, 122, 1, 0, 34, 34, 2, 0, 10, 10, 13, 13, 1, 0, 126, 126, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 343, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 1, 79, 1, 0, 0, 0, 3, 87, 1, 0, 0, 0, 5, 97, 1, 0, 0, 0, 7, 111, 1, 0, 0, 0, 9, 122, 1, 0, 0, 0, 11, 124, 1, 0, 0, 0, 13, 131, 1, 0, 0, 0, 15, 135, 1, 0, 0, 0, 17, 138, 1, 0, 0, 0, 19, 145, 1, 0, 0, 0, 21, 148, 1, 0, 0, 0, 23, 157, 1, 0, 0, 0, 25, 166, 1, 0, 0, 0, 27, 170, 1, 0, 0, 0, 29, 176, 1, 0, 0, 0, 31, 183, 1, 0, 0, 0, 33, 190, 1, 0, 0, 0, 35, 198, 1, 0, 0, 0, 37, 203, 1, 0, 0, 0, 39, 208, 1, 0, 0, 0, 41, 215, 1, 0, 0, 0, 43, 225, 1, 0, 0, 0, 45, 233, 1, 0, 0, 0, 47, 242, 1, 0, 0, 0, 49, 246, 1, 0, 0, 0, 51, 256, 1, 0, 0, 0, 53, 280, 1, 0, 0, 0, 55, 283, 1, 0, 0, 0, 57, 290, 1, 0, 0, 0, 59, 312, 1, 0, 0, 0, 61, 314, 1, 0, 0, 0, 63, 316, 1, 0, 0, 0, 65, 318, 1, 0, 0, 0, 67, 320, 1, 0, 0, 0, 69, 322, 1, 0, 0, 0, 71, 324, 1, 0, 0, 0, 73, 326, 1, 0, 0, 0, 75, 328, 1, 0, 0, 0, 77, 330, 1, 0, 0, 0, 79, 80, 5, 112, 0, 0, 80, 81, 5, 97, 0, 0, 81, 82, 5, 99, 0, 0, 82, 83, 5, 107, 0, 0, 83, 84, 5, 97, 0, 0, 84, 85, 5, 103, 0, 0, 85, 86, 5, 101, 0, 0, 86, 2, 1, 0, 0, 0, 87, 88, 5, 105, 0, 0, 88, 89, 5, 110, 0, 0, 89, 90, 5, 116, 0, 0, 90, 91, 5, 101, 0, 0, 91, 92, 5, 114, 0, 0, 92, 93, 5, 102, 0, 0, 93, 94, 5, 97, 0, 0, 94, 95, 5, 99, 0, 0, 95, 96, 5, 101, 0, 0, 96, 4, 1, 0, 0, 0, 97, 98, 5, 115, 0, 0, 98, 99, 5, 112, 0, 0, 99, 100, 5, 101, 0, 0, 100, 101, 5, 99, 0, 0, 101, 102, 5, 105, 0, 0, 102, 103, 5, 102, 0, 0, 103, 104, 5, 105, 0, 0, 104, 105, 5, 99, 0, 0, 105, 106, 5, 97, 0, 0, 106, 107, 5, 116, 0, 0, 107, 108, 5, 105, 0, 0, 108, 109, 5, 111, 0, 0, 109, 110, 5, 110, 0, 0, 110, 6, 1, 0, 0, 0, 111, 112, 5, 105, 0, 0, 112, 113, 5, 109, 0, 0, 113, 114, 5, 112, 0, 0, 114, 115, 5, 108, 0, 0, 115, 116, 5, 101, 0, 0, 116, 117, 5, 109, 0, 0, 117, 118, 5, 101, 0, 0, 118, 119, 5, 110, 0, 0, 119, 120, 5, 116, 0, 0, 120, 121, 5, 115, 0, 0, 121, 8, 1, 0, 0, 0, 122, 123, 5, 64, 0, 0, 123, 10, 1, 0, 0, 0, 124, 125, 5, 114, 0, 0, 125, 126, 5, 101, 0, 0, 126, 127, 5, 115, 0, 0, 127, 128, 5, 117, 0, 0, 128, 129, 5, 108, 0, 0, 129, 130, 5, 116, 0, 0, 130, 12, 1, 0, 0, 0, 131, 132, 5, 65, 0, 0, 132, 133, 5, 78, 0, 0, 133, 134, 5, 68, 0, 0, 134, 14, 1, 0, 0, 0, 135, 136, 5, 79, 0, 0, 136, 137, 5, 82, 0, 0, 137, 16, 1, 0, 0, 0, 138, 139, 5, 114, 0, 0, 139, 140, 5, 101, 0, 0, 140, 141, 5, 116, 0, 0, 141, 142, 5, 117, 0, 0, 142, 143, 5, 114, 0, 0, 143, 144, 5, 110, 0, 0, 144, 18, 1, 0, 0, 0, 145, 146, 5, 91, 0, 0, 146, 147, 5, 93, 0, 0, 147, 20, 1, 0, 0, 0, 148, 149, 5, 99, 0, 0, 149, 150, 5, 114, 0, 0, 150, 151, 5, 105, 0, 0, 151, 152, 5, 116, 0, 0, 152, 153, 5, 105, 0, 0, 153, 154, 5, 99, 0, 0, 154, 155, 5, 97, 0, 0, 155, 156, 5, 108, 0, 0, 156, 22, 1, 0, 0, 0, 157, 158, 5, 111, 0, 0, 158, 159, 5, 112, 0, 0, 159, 160, 5, 116, 0, 0, 160, 161, 5, 105, 0, 0, 161, 162, 5, 111, 0, 0, 162, 163, 5, 110, 0, 0, 163, 164, 5, 97, 0, 0, 164, 165, 5, 108, 0, 0, 165, 24, 1, 0, 0, 0, 166, 167, 5, 73, 0, 0, 167, 168, 5, 78, 0, 0, 168, 169, 5, 84, 0, 0, 169, 26, 1, 0, 0, 0, 170, 171, 5, 70, 0, 0, 171, 172, 5, 76, 0, 0, 172, 173, 5, 79, 0, 0, 173, 174, 5, 65, 0, 0, 174, 175, 5, 84, 0, 0, 175, 28, 1, 0, 0, 0, 176, 177, 5, 68, 0, 0, 177, 178, 5, 79, 0, 0, 178, 179, 5, 85, 0, 0, 179, 180, 5, 66, 0, 0, 180, 181, 5, 76, 0, 0, 181, 182, 5, 69, 0, 0, 182, 30, 1, 0, 0, 0, 183, 184, 5, 83, 0, 0, 184, 185, 5, 84, 0, 0, 185, 186, 5, 82, 0, 0, 186, 187, 5, 73, 0, 0, 187, 188, 5, 78, 0, 0, 188, 189, 5, 71, 0, 0, 189, 32, 1, 0, 0, 0, 190, 191, 5, 66, 0, 0, 191, 192, 5, 79, 0, 0, 192, 193, 5, 79, 0, 0, 193, 194, 5, 76, 0, 0, 194, 195, 5, 69, 0, 0, 195, 196, 5, 65, 0, 0, 196, 197, 5, 78, 0, 0, 197, 34, 1, 0, 0, 0, 198, 199, 5, 67, 0, 0, 199, 200, 5, 72, 0, 0, 200, 201, 5, 65, 0, 0, 201, 202, 5, 82, 0, 0, 202, 36, 1, 0, 0, 0, 203, 204, 5, 86, 0, 0, 204, 205, 5, 79, 0, 0, 205, 206, 5, 73, 0, 0, 206, 207, 5, 68, 0, 0, 207, 38, 1, 0, 0, 0, 208, 209, 5, 112, 0, 0, 209, 210, 5, 117, 0, 0, 210, 211, 5, 98, 0, 0, 211, 212, 5, 108, 0, 0, 212, 213, 5, 105, 0, 0, 213, 214, 5, 99, 0, 0, 214, 40, 1, 0, 0, 0, 215, 216, 5, 112, 0, 0, 216, 217, 5, 114, 0, 0, 217, 218, 5, 111, 0, 0, 218, 219, 5, 116, 0, 0, 219, 220, 5, 101, 0, 0, 220, 221, 5, 99, 0, 0, 221, 222, 5, 116, 0, 0, 222, 223, 5, 101, 0, 0, 223, 224, 5, 100, 0, 0, 224, 42, 1, 0, 0, 0, 225, 226, 5, 112, 0, 0, 226, 227, 5, 114, 0, 0, 227, 228, 5, 105, 0, 0, 228, 229, 5, 118, 0, 0, 229, 230, 5, 97, 0, 0, 230, 231, 5, 116, 0, 0, 231, 232, 5, 101, 0, 0, 232, 44, 1, 0, 0, 0, 233, 234, 5, 100, 0, 0, 234, 235, 5, 101, 0, 0, 235, 236, 5, 102, 0, 0, 236, 237, 5, 97, 0, 0, 237, 238, 5, 117, 0, 0, 238, 239, 5, 108, 0, 0, 239, 240, 5, 116, 0, 0, 240, 46, 1, 0, 0, 0, 241, 243, 7, 0, 0, 0, 242, 241, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 242, 1, 0, 0, 0, 244, 245, 1, 0, 0, 0, 245, 48, 1, 0, 0, 0, 246, 250, 5, 34, 0, 0, 247, 249, 8, 1, 0, 0, 248, 247, 1, 0, 0, 0, 249, 252, 1, 0, 0, 0, 250, 248, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251, 253, 1, 0, 0, 0, 252, 250, 1, 0, 0, 0, 253, 254, 5, 34, 0, 0, 254, 50, 1, 0, 0, 0, 255, 257, 7, 2, 0, 0, 256, 255, 1, 0, 0, 0, 257, 258, 1, 0, 0, 0, 258, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 260, 1, 0, 0, 0, 260, 261, 6, 25, 0, 0, 261, 52, 1, 0, 0, 0, 262, 266, 5, 126, 0, 0, 263, 265, 8, 3, 0, 0, 264, 263, 1, 0, 0, 0, 265, 268, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 266, 264, 1, 0, 0, 0, 267, 269, 1, 0, 0, 0, 268, 266, 1, 0, 0, 0, 269, 281, 5, 126, 0, 0, 270, 271, 5, 47, 0, 0, 271, 272, 5, 47, 0, 0, 272, 276, 1, 0, 0, 0, 273, 275, 8, 2, 0, 0, 274, 273, 1, 0, 0, 0, 275, 278, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 279, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0, 279, 281, 3, 51, 25, 0, 280, 262, 1, 0, 0, 0, 280, 270, 1, 0, 0, 0, 281, 54, 1, 0, 0, 0, 282, 284, 7, 4, 0, 0, 283, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 288, 6, 27, 0, 0, 288, 56, 1, 0, 0, 0, 289, 291, 7, 5, 0, 0, 290, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 58, 1, 0, 0, 0, 294, 296, 7, 5, 0, 0, 295, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 299, 1, 0, 0, 0, 299, 303, 5, 46, 0, 0, 300, 302, 7, 5, 0, 0, 301, 300, 1, 0, 0, 0, 302, 305, 1, 0, 0, 0, 303, 301, 1, 0, 0, 0, 303, 304, 1, 0, 0, 0, 304, 313, 1, 0, 0, 0, 305, 303, 1, 0, 0, 0, 306, 308, 5, 46, 0, 0, 307, 309, 7, 5, 0, 0, 308, 307, 1, 0, 0, 0, 309, 310, 1, 0, 0, 0, 310, 308, 1, 0, 0, 0, 310, 311, 1, 0, 0, 0, 311, 313, 1, 0, 0, 0, 312, 295, 1, 0, 0, 0, 312, 306, 1, 0, 0, 0, 313, 60, 1, 0, 0, 0, 314, 315, 5, 40, 0, 0, 315, 62, 1, 0, 0, 0, 316, 317, 5, 41, 0, 0, 317, 64, 1, 0, 0, 0, 318, 319, 5, 58, 0, 0, 319, 66, 1, 0, 0, 0, 320, 321, 5, 59, 0, 0, 321, 68, 1, 0, 0, 0, 322, 323, 5, 44, 0, 0, 323, 70, 1, 0, 0, 0, 324, 325, 5, 123, 0, 0, 325, 72, 1, 0, 0, 0, 326, 327, 5, 125, 0, 0, 327, 74, 1, 0, 0, 0, 328, 329, 5, 126, 0, 0, 329, 76, 1, 0, 0, 0, 330, 331, 5, 33, 0, 0, 331, 78, 1, 0, 0, 0, 13, 0, 244, 250, 258, 266, 276, 280, 285, 292, 297, 303, 310, 312, 1, 6, 0, 0]
\ No newline at end of file
+[4, 0, 39, 329, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 4, 23, 243, 8, 23, 11, 23, 12, 23, 244, 1, 24, 4, 24, 248, 8, 24, 11, 24, 12, 24, 249, 1, 25, 4, 25, 253, 8, 25, 11, 25, 12, 25, 254, 1, 25, 1, 25, 5, 25, 259, 8, 25, 10, 25, 12, 25, 262, 9, 25, 1, 25, 1, 25, 4, 25, 266, 8, 25, 11, 25, 12, 25, 267, 3, 25, 270, 8, 25, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 276, 8, 26, 10, 26, 12, 26, 279, 9, 26, 1, 26, 1, 26, 1, 27, 4, 27, 284, 8, 27, 11, 27, 12, 27, 285, 1, 27, 1, 27, 1, 28, 1, 28, 5, 28, 292, 8, 28, 10, 28, 12, 28, 295, 9, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 5, 29, 305, 8, 29, 10, 29, 12, 29, 308, 9, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 293, 0, 39, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 1, 0, 5, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 2, 0, 34, 34, 92, 92, 3, 0, 9, 10, 13, 13, 32, 32, 2, 0, 10, 10, 13, 13, 339, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 1, 79, 1, 0, 0, 0, 3, 87, 1, 0, 0, 0, 5, 97, 1, 0, 0, 0, 7, 111, 1, 0, 0, 0, 9, 122, 1, 0, 0, 0, 11, 124, 1, 0, 0, 0, 13, 131, 1, 0, 0, 0, 15, 138, 1, 0, 0, 0, 17, 141, 1, 0, 0, 0, 19, 150, 1, 0, 0, 0, 21, 159, 1, 0, 0, 0, 23, 163, 1, 0, 0, 0, 25, 169, 1, 0, 0, 0, 27, 176, 1, 0, 0, 0, 29, 183, 1, 0, 0, 0, 31, 191, 1, 0, 0, 0, 33, 196, 1, 0, 0, 0, 35, 201, 1, 0, 0, 0, 37, 208, 1, 0, 0, 0, 39, 218, 1, 0, 0, 0, 41, 226, 1, 0, 0, 0, 43, 234, 1, 0, 0, 0, 45, 238, 1, 0, 0, 0, 47, 242, 1, 0, 0, 0, 49, 247, 1, 0, 0, 0, 51, 269, 1, 0, 0, 0, 53, 271, 1, 0, 0, 0, 55, 283, 1, 0, 0, 0, 57, 289, 1, 0, 0, 0, 59, 300, 1, 0, 0, 0, 61, 311, 1, 0, 0, 0, 63, 313, 1, 0, 0, 0, 65, 315, 1, 0, 0, 0, 67, 317, 1, 0, 0, 0, 69, 319, 1, 0, 0, 0, 71, 321, 1, 0, 0, 0, 73, 323, 1, 0, 0, 0, 75, 325, 1, 0, 0, 0, 77, 327, 1, 0, 0, 0, 79, 80, 5, 112, 0, 0, 80, 81, 5, 97, 0, 0, 81, 82, 5, 99, 0, 0, 82, 83, 5, 107, 0, 0, 83, 84, 5, 97, 0, 0, 84, 85, 5, 103, 0, 0, 85, 86, 5, 101, 0, 0, 86, 2, 1, 0, 0, 0, 87, 88, 5, 105, 0, 0, 88, 89, 5, 110, 0, 0, 89, 90, 5, 116, 0, 0, 90, 91, 5, 101, 0, 0, 91, 92, 5, 114, 0, 0, 92, 93, 5, 102, 0, 0, 93, 94, 5, 97, 0, 0, 94, 95, 5, 99, 0, 0, 95, 96, 5, 101, 0, 0, 96, 4, 1, 0, 0, 0, 97, 98, 5, 115, 0, 0, 98, 99, 5, 112, 0, 0, 99, 100, 5, 101, 0, 0, 100, 101, 5, 99, 0, 0, 101, 102, 5, 105, 0, 0, 102, 103, 5, 102, 0, 0, 103, 104, 5, 105, 0, 0, 104, 105, 5, 99, 0, 0, 105, 106, 5, 97, 0, 0, 106, 107, 5, 116, 0, 0, 107, 108, 5, 105, 0, 0, 108, 109, 5, 111, 0, 0, 109, 110, 5, 110, 0, 0, 110, 6, 1, 0, 0, 0, 111, 112, 5, 105, 0, 0, 112, 113, 5, 109, 0, 0, 113, 114, 5, 112, 0, 0, 114, 115, 5, 108, 0, 0, 115, 116, 5, 101, 0, 0, 116, 117, 5, 109, 0, 0, 117, 118, 5, 101, 0, 0, 118, 119, 5, 110, 0, 0, 119, 120, 5, 116, 0, 0, 120, 121, 5, 115, 0, 0, 121, 8, 1, 0, 0, 0, 122, 123, 5, 64, 0, 0, 123, 10, 1, 0, 0, 0, 124, 125, 5, 114, 0, 0, 125, 126, 5, 101, 0, 0, 126, 127, 5, 115, 0, 0, 127, 128, 5, 117, 0, 0, 128, 129, 5, 108, 0, 0, 129, 130, 5, 116, 0, 0, 130, 12, 1, 0, 0, 0, 131, 132, 5, 114, 0, 0, 132, 133, 5, 101, 0, 0, 133, 134, 5, 116, 0, 0, 134, 135, 5, 117, 0, 0, 135, 136, 5, 114, 0, 0, 136, 137, 5, 110, 0, 0, 137, 14, 1, 0, 0, 0, 138, 139, 5, 91, 0, 0, 139, 140, 5, 93, 0, 0, 140, 16, 1, 0, 0, 0, 141, 142, 5, 99, 0, 0, 142, 143, 5, 114, 0, 0, 143, 144, 5, 105, 0, 0, 144, 145, 5, 116, 0, 0, 145, 146, 5, 105, 0, 0, 146, 147, 5, 99, 0, 0, 147, 148, 5, 97, 0, 0, 148, 149, 5, 108, 0, 0, 149, 18, 1, 0, 0, 0, 150, 151, 5, 111, 0, 0, 151, 152, 5, 112, 0, 0, 152, 153, 5, 116, 0, 0, 153, 154, 5, 105, 0, 0, 154, 155, 5, 111, 0, 0, 155, 156, 5, 110, 0, 0, 156, 157, 5, 97, 0, 0, 157, 158, 5, 108, 0, 0, 158, 20, 1, 0, 0, 0, 159, 160, 5, 73, 0, 0, 160, 161, 5, 78, 0, 0, 161, 162, 5, 84, 0, 0, 162, 22, 1, 0, 0, 0, 163, 164, 5, 70, 0, 0, 164, 165, 5, 76, 0, 0, 165, 166, 5, 79, 0, 0, 166, 167, 5, 65, 0, 0, 167, 168, 5, 84, 0, 0, 168, 24, 1, 0, 0, 0, 169, 170, 5, 68, 0, 0, 170, 171, 5, 79, 0, 0, 171, 172, 5, 85, 0, 0, 172, 173, 5, 66, 0, 0, 173, 174, 5, 76, 0, 0, 174, 175, 5, 69, 0, 0, 175, 26, 1, 0, 0, 0, 176, 177, 5, 83, 0, 0, 177, 178, 5, 84, 0, 0, 178, 179, 5, 82, 0, 0, 179, 180, 5, 73, 0, 0, 180, 181, 5, 78, 0, 0, 181, 182, 5, 71, 0, 0, 182, 28, 1, 0, 0, 0, 183, 184, 5, 66, 0, 0, 184, 185, 5, 79, 0, 0, 185, 186, 5, 79, 0, 0, 186, 187, 5, 76, 0, 0, 187, 188, 5, 69, 0, 0, 188, 189, 5, 65, 0, 0, 189, 190, 5, 78, 0, 0, 190, 30, 1, 0, 0, 0, 191, 192, 5, 67, 0, 0, 192, 193, 5, 72, 0, 0, 193, 194, 5, 65, 0, 0, 194, 195, 5, 82, 0, 0, 195, 32, 1, 0, 0, 0, 196, 197, 5, 86, 0, 0, 197, 198, 5, 79, 0, 0, 198, 199, 5, 73, 0, 0, 199, 200, 5, 68, 0, 0, 200, 34, 1, 0, 0, 0, 201, 202, 5, 112, 0, 0, 202, 203, 5, 117, 0, 0, 203, 204, 5, 98, 0, 0, 204, 205, 5, 108, 0, 0, 205, 206, 5, 105, 0, 0, 206, 207, 5, 99, 0, 0, 207, 36, 1, 0, 0, 0, 208, 209, 5, 112, 0, 0, 209, 210, 5, 114, 0, 0, 210, 211, 5, 111, 0, 0, 211, 212, 5, 116, 0, 0, 212, 213, 5, 101, 0, 0, 213, 214, 5, 99, 0, 0, 214, 215, 5, 116, 0, 0, 215, 216, 5, 101, 0, 0, 216, 217, 5, 100, 0, 0, 217, 38, 1, 0, 0, 0, 218, 219, 5, 112, 0, 0, 219, 220, 5, 114, 0, 0, 220, 221, 5, 105, 0, 0, 221, 222, 5, 118, 0, 0, 222, 223, 5, 97, 0, 0, 223, 224, 5, 116, 0, 0, 224, 225, 5, 101, 0, 0, 225, 40, 1, 0, 0, 0, 226, 227, 5, 100, 0, 0, 227, 228, 5, 101, 0, 0, 228, 229, 5, 102, 0, 0, 229, 230, 5, 97, 0, 0, 230, 231, 5, 117, 0, 0, 231, 232, 5, 108, 0, 0, 232, 233, 5, 116, 0, 0, 233, 42, 1, 0, 0, 0, 234, 235, 5, 65, 0, 0, 235, 236, 5, 78, 0, 0, 236, 237, 5, 68, 0, 0, 237, 44, 1, 0, 0, 0, 238, 239, 5, 79, 0, 0, 239, 240, 5, 82, 0, 0, 240, 46, 1, 0, 0, 0, 241, 243, 7, 0, 0, 0, 242, 241, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 242, 1, 0, 0, 0, 244, 245, 1, 0, 0, 0, 245, 48, 1, 0, 0, 0, 246, 248, 7, 1, 0, 0, 247, 246, 1, 0, 0, 0, 248, 249, 1, 0, 0, 0, 249, 247, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 50, 1, 0, 0, 0, 251, 253, 7, 1, 0, 0, 252, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 256, 1, 0, 0, 0, 256, 260, 5, 46, 0, 0, 257, 259, 7, 1, 0, 0, 258, 257, 1, 0, 0, 0, 259, 262, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 270, 1, 0, 0, 0, 262, 260, 1, 0, 0, 0, 263, 265, 5, 46, 0, 0, 264, 266, 7, 1, 0, 0, 265, 264, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 267, 265, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 270, 1, 0, 0, 0, 269, 252, 1, 0, 0, 0, 269, 263, 1, 0, 0, 0, 270, 52, 1, 0, 0, 0, 271, 277, 5, 34, 0, 0, 272, 273, 5, 92, 0, 0, 273, 276, 7, 2, 0, 0, 274, 276, 8, 2, 0, 0, 275, 272, 1, 0, 0, 0, 275, 274, 1, 0, 0, 0, 276, 279, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 280, 1, 0, 0, 0, 279, 277, 1, 0, 0, 0, 280, 281, 5, 34, 0, 0, 281, 54, 1, 0, 0, 0, 282, 284, 7, 3, 0, 0, 283, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 288, 6, 27, 0, 0, 288, 56, 1, 0, 0, 0, 289, 293, 5, 126, 0, 0, 290, 292, 9, 0, 0, 0, 291, 290, 1, 0, 0, 0, 292, 295, 1, 0, 0, 0, 293, 294, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294, 296, 1, 0, 0, 0, 295, 293, 1, 0, 0, 0, 296, 297, 5, 126, 0, 0, 297, 298, 1, 0, 0, 0, 298, 299, 6, 28, 1, 0, 299, 58, 1, 0, 0, 0, 300, 301, 5, 47, 0, 0, 301, 302, 5, 47, 0, 0, 302, 306, 1, 0, 0, 0, 303, 305, 8, 4, 0, 0, 304, 303, 1, 0, 0, 0, 305, 308, 1, 0, 0, 0, 306, 304, 1, 0, 0, 0, 306, 307, 1, 0, 0, 0, 307, 309, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 309, 310, 6, 29, 1, 0, 310, 60, 1, 0, 0, 0, 311, 312, 5, 40, 0, 0, 312, 62, 1, 0, 0, 0, 313, 314, 5, 41, 0, 0, 314, 64, 1, 0, 0, 0, 315, 316, 5, 58, 0, 0, 316, 66, 1, 0, 0, 0, 317, 318, 5, 59, 0, 0, 318, 68, 1, 0, 0, 0, 319, 320, 5, 44, 0, 0, 320, 70, 1, 0, 0, 0, 321, 322, 5, 123, 0, 0, 322, 72, 1, 0, 0, 0, 323, 324, 5, 125, 0, 0, 324, 74, 1, 0, 0, 0, 325, 326, 5, 126, 0, 0, 326, 76, 1, 0, 0, 0, 327, 328, 5, 33, 0, 0, 328, 78, 1, 0, 0, 0, 12, 0, 244, 249, 254, 260, 267, 269, 275, 277, 285, 293, 306, 2, 6, 0, 0, 0, 1, 0]
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/WinxLexer.java b/src/main/java/org/lumijiez/parser/WinxLexer.java
index d5eb849..31b6fbd 100644
--- a/src/main/java/org/lumijiez/parser/WinxLexer.java
+++ b/src/main/java/org/lumijiez/parser/WinxLexer.java
@@ -1,12 +1,13 @@
 // Generated from D:/Source/JavaProjects/dsl-formal-requirements/src/grammars/Winx.g4 by ANTLR 4.13.1
 package org.lumijiez.parser;
-
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
 import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.misc.*;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
 public class WinxLexer extends Lexer {
@@ -18,8 +19,8 @@ public class WinxLexer extends Lexer {
 	public static final int
 		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
 		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, ID=24, STRING=25, 
-		NEWLINE=26, COMMENT=27, WS=28, INT=29, FLOAT=30, LPAREN=31, RPAREN=32, 
+		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, ID=24, INT=25, 
+		FLOAT=26, STRING=27, WS=28, COMMENT=29, LINE_COMMENT=30, LPAREN=31, RPAREN=32, 
 		COLON=33, SEMICOLON=34, COMMA=35, LBRACE=36, RBRACE=37, TILDE=38, EXCLAM=39;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
@@ -33,8 +34,8 @@ public class WinxLexer extends Lexer {
 		return new String[] {
 			"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
 			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
-			"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "ID", "STRING", 
-			"NEWLINE", "COMMENT", "WS", "INT", "FLOAT", "LPAREN", "RPAREN", "COLON", 
+			"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "ID", "INT", "FLOAT", 
+			"STRING", "WS", "COMMENT", "LINE_COMMENT", "LPAREN", "RPAREN", "COLON", 
 			"SEMICOLON", "COMMA", "LBRACE", "RBRACE", "TILDE", "EXCLAM"
 		};
 	}
@@ -43,11 +44,11 @@ public class WinxLexer extends Lexer {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'package'", "'interface'", "'specification'", "'implements'", 
-			"'@'", "'result'", "'AND'", "'OR'", "'return'", "'[]'", "'critical'", 
-			"'optional'", "'INT'", "'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", 
-			"'CHAR'", "'VOID'", "'public'", "'protected'", "'private'", "'default'", 
-			null, null, null, null, null, null, null, "'('", "')'", "':'", "';'", 
-			"','", "'{'", "'}'", "'~'", "'!'"
+			"'@'", "'result'", "'return'", "'[]'", "'critical'", "'optional'", "'INT'", 
+			"'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", "'CHAR'", "'VOID'", "'public'", 
+			"'protected'", "'private'", "'default'", "'AND'", "'OR'", null, null, 
+			null, null, null, null, null, "'('", "')'", "':'", "';'", "','", "'{'", 
+			"'}'", "'~'", "'!'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -55,7 +56,7 @@ public class WinxLexer extends Lexer {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			"ID", "STRING", "NEWLINE", "COMMENT", "WS", "INT", "FLOAT", "LPAREN", 
+			"ID", "INT", "FLOAT", "STRING", "WS", "COMMENT", "LINE_COMMENT", "LPAREN", 
 			"RPAREN", "COLON", "SEMICOLON", "COMMA", "LBRACE", "RBRACE", "TILDE", 
 			"EXCLAM"
 		};
@@ -119,7 +120,7 @@ public class WinxLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\u0004\u0000\'\u014c\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
+		"\u0004\u0000\'\u0149\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
 		"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
 		"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
 		"\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+
@@ -140,79 +141,78 @@ public class WinxLexer extends Lexer {
 		"\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+
 		"\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005"+
 		"\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006"+
-		"\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001"+
-		"\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001"+
-		"\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001"+
-		"\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+
-		"\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r"+
-		"\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001"+
-		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001"+
-		"\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+
-		"\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+
-		"\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001"+
-		"\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001"+
-		"\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001"+
-		"\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001"+
-		"\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001"+
-		"\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001"+
-		"\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001"+
-		"\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0004\u0017\u00f3\b\u0017\u000b"+
-		"\u0017\f\u0017\u00f4\u0001\u0018\u0001\u0018\u0005\u0018\u00f9\b\u0018"+
-		"\n\u0018\f\u0018\u00fc\t\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0004"+
-		"\u0019\u0101\b\u0019\u000b\u0019\f\u0019\u0102\u0001\u0019\u0001\u0019"+
-		"\u0001\u001a\u0001\u001a\u0005\u001a\u0109\b\u001a\n\u001a\f\u001a\u010c"+
-		"\t\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0005"+
-		"\u001a\u0113\b\u001a\n\u001a\f\u001a\u0116\t\u001a\u0001\u001a\u0003\u001a"+
-		"\u0119\b\u001a\u0001\u001b\u0004\u001b\u011c\b\u001b\u000b\u001b\f\u001b"+
-		"\u011d\u0001\u001b\u0001\u001b\u0001\u001c\u0004\u001c\u0123\b\u001c\u000b"+
-		"\u001c\f\u001c\u0124\u0001\u001d\u0004\u001d\u0128\b\u001d\u000b\u001d"+
-		"\f\u001d\u0129\u0001\u001d\u0001\u001d\u0005\u001d\u012e\b\u001d\n\u001d"+
-		"\f\u001d\u0131\t\u001d\u0001\u001d\u0001\u001d\u0004\u001d\u0135\b\u001d"+
-		"\u000b\u001d\f\u001d\u0136\u0003\u001d\u0139\b\u001d\u0001\u001e\u0001"+
-		"\u001e\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001"+
-		"\"\u0001#\u0001#\u0001$\u0001$\u0001%\u0001%\u0001&\u0001&\u0001\u010a"+
-		"\u0000\'\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b"+
-		"\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b"+
-		"\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016"+
-		"-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\""+
-		"E#G$I%K&M\'\u0001\u0000\u0006\u0002\u0000AZaz\u0001\u0000\"\"\u0002\u0000"+
-		"\n\n\r\r\u0001\u0000~~\u0003\u0000\t\n\r\r  \u0001\u000009\u0157\u0000"+
-		"\u0001\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000"+
-		"\u0005\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000"+
-		"\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r"+
-		"\u0001\u0000\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011"+
-		"\u0001\u0000\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015"+
-		"\u0001\u0000\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019"+
-		"\u0001\u0000\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d"+
-		"\u0001\u0000\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001"+
-		"\u0000\u0000\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000"+
-		"\u0000\u0000\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000"+
-		"\u0000+\u0001\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/"+
-		"\u0001\u0000\u0000\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000"+
-		"\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000"+
-		"\u00009\u0001\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000="+
-		"\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000"+
-		"\u0000\u0000\u0000C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000"+
-		"\u0000G\u0001\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K"+
-		"\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000\u0000\u0001O\u0001\u0000"+
-		"\u0000\u0000\u0003W\u0001\u0000\u0000\u0000\u0005a\u0001\u0000\u0000\u0000"+
-		"\u0007o\u0001\u0000\u0000\u0000\tz\u0001\u0000\u0000\u0000\u000b|\u0001"+
-		"\u0000\u0000\u0000\r\u0083\u0001\u0000\u0000\u0000\u000f\u0087\u0001\u0000"+
-		"\u0000\u0000\u0011\u008a\u0001\u0000\u0000\u0000\u0013\u0091\u0001\u0000"+
-		"\u0000\u0000\u0015\u0094\u0001\u0000\u0000\u0000\u0017\u009d\u0001\u0000"+
-		"\u0000\u0000\u0019\u00a6\u0001\u0000\u0000\u0000\u001b\u00aa\u0001\u0000"+
-		"\u0000\u0000\u001d\u00b0\u0001\u0000\u0000\u0000\u001f\u00b7\u0001\u0000"+
-		"\u0000\u0000!\u00be\u0001\u0000\u0000\u0000#\u00c6\u0001\u0000\u0000\u0000"+
-		"%\u00cb\u0001\u0000\u0000\u0000\'\u00d0\u0001\u0000\u0000\u0000)\u00d7"+
-		"\u0001\u0000\u0000\u0000+\u00e1\u0001\u0000\u0000\u0000-\u00e9\u0001\u0000"+
-		"\u0000\u0000/\u00f2\u0001\u0000\u0000\u00001\u00f6\u0001\u0000\u0000\u0000"+
-		"3\u0100\u0001\u0000\u0000\u00005\u0118\u0001\u0000\u0000\u00007\u011b"+
-		"\u0001\u0000\u0000\u00009\u0122\u0001\u0000\u0000\u0000;\u0138\u0001\u0000"+
-		"\u0000\u0000=\u013a\u0001\u0000\u0000\u0000?\u013c\u0001\u0000\u0000\u0000"+
-		"A\u013e\u0001\u0000\u0000\u0000C\u0140\u0001\u0000\u0000\u0000E\u0142"+
-		"\u0001\u0000\u0000\u0000G\u0144\u0001\u0000\u0000\u0000I\u0146\u0001\u0000"+
-		"\u0000\u0000K\u0148\u0001\u0000\u0000\u0000M\u014a\u0001\u0000\u0000\u0000"+
-		"OP\u0005p\u0000\u0000PQ\u0005a\u0000\u0000QR\u0005c\u0000\u0000RS\u0005"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007"+
+		"\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001"+
+		"\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+
+		"\t\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\u000b"+
+		"\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001"+
+		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
+		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f"+
+		"\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0010"+
+		"\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011"+
+		"\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012"+
+		"\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+
+		"\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013"+
+		"\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014"+
+		"\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015"+
+		"\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016"+
+		"\u0001\u0017\u0004\u0017\u00f3\b\u0017\u000b\u0017\f\u0017\u00f4\u0001"+
+		"\u0018\u0004\u0018\u00f8\b\u0018\u000b\u0018\f\u0018\u00f9\u0001\u0019"+
+		"\u0004\u0019\u00fd\b\u0019\u000b\u0019\f\u0019\u00fe\u0001\u0019\u0001"+
+		"\u0019\u0005\u0019\u0103\b\u0019\n\u0019\f\u0019\u0106\t\u0019\u0001\u0019"+
+		"\u0001\u0019\u0004\u0019\u010a\b\u0019\u000b\u0019\f\u0019\u010b\u0003"+
+		"\u0019\u010e\b\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0005"+
+		"\u001a\u0114\b\u001a\n\u001a\f\u001a\u0117\t\u001a\u0001\u001a\u0001\u001a"+
+		"\u0001\u001b\u0004\u001b\u011c\b\u001b\u000b\u001b\f\u001b\u011d\u0001"+
+		"\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0005\u001c\u0124\b\u001c\n"+
+		"\u001c\f\u001c\u0127\t\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001"+
+		"\u001c\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0005\u001d\u0131"+
+		"\b\u001d\n\u001d\f\u001d\u0134\t\u001d\u0001\u001d\u0001\u001d\u0001\u001e"+
+		"\u0001\u001e\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001"+
+		"\"\u0001\"\u0001#\u0001#\u0001$\u0001$\u0001%\u0001%\u0001&\u0001&\u0001"+
+		"\u0125\u0000\'\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005"+
+		"\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019"+
+		"\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015"+
+		"+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f"+
+		"? A!C\"E#G$I%K&M\'\u0001\u0000\u0005\u0002\u0000AZaz\u0001\u000009\u0002"+
+		"\u0000\"\"\\\\\u0003\u0000\t\n\r\r  \u0002\u0000\n\n\r\r\u0153\u0000\u0001"+
+		"\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005"+
+		"\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001"+
+		"\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000"+
+		"\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000"+
+		"\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000"+
+		"\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000"+
+		"\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000"+
+		"\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000"+
+		"\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000"+
+		"\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001"+
+		"\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000"+
+		"\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u0000"+
+		"5\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001"+
+		"\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000"+
+		"\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000"+
+		"C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001"+
+		"\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000"+
+		"\u0000\u0000M\u0001\u0000\u0000\u0000\u0001O\u0001\u0000\u0000\u0000\u0003"+
+		"W\u0001\u0000\u0000\u0000\u0005a\u0001\u0000\u0000\u0000\u0007o\u0001"+
+		"\u0000\u0000\u0000\tz\u0001\u0000\u0000\u0000\u000b|\u0001\u0000\u0000"+
+		"\u0000\r\u0083\u0001\u0000\u0000\u0000\u000f\u008a\u0001\u0000\u0000\u0000"+
+		"\u0011\u008d\u0001\u0000\u0000\u0000\u0013\u0096\u0001\u0000\u0000\u0000"+
+		"\u0015\u009f\u0001\u0000\u0000\u0000\u0017\u00a3\u0001\u0000\u0000\u0000"+
+		"\u0019\u00a9\u0001\u0000\u0000\u0000\u001b\u00b0\u0001\u0000\u0000\u0000"+
+		"\u001d\u00b7\u0001\u0000\u0000\u0000\u001f\u00bf\u0001\u0000\u0000\u0000"+
+		"!\u00c4\u0001\u0000\u0000\u0000#\u00c9\u0001\u0000\u0000\u0000%\u00d0"+
+		"\u0001\u0000\u0000\u0000\'\u00da\u0001\u0000\u0000\u0000)\u00e2\u0001"+
+		"\u0000\u0000\u0000+\u00ea\u0001\u0000\u0000\u0000-\u00ee\u0001\u0000\u0000"+
+		"\u0000/\u00f2\u0001\u0000\u0000\u00001\u00f7\u0001\u0000\u0000\u00003"+
+		"\u010d\u0001\u0000\u0000\u00005\u010f\u0001\u0000\u0000\u00007\u011b\u0001"+
+		"\u0000\u0000\u00009\u0121\u0001\u0000\u0000\u0000;\u012c\u0001\u0000\u0000"+
+		"\u0000=\u0137\u0001\u0000\u0000\u0000?\u0139\u0001\u0000\u0000\u0000A"+
+		"\u013b\u0001\u0000\u0000\u0000C\u013d\u0001\u0000\u0000\u0000E\u013f\u0001"+
+		"\u0000\u0000\u0000G\u0141\u0001\u0000\u0000\u0000I\u0143\u0001\u0000\u0000"+
+		"\u0000K\u0145\u0001\u0000\u0000\u0000M\u0147\u0001\u0000\u0000\u0000O"+
+		"P\u0005p\u0000\u0000PQ\u0005a\u0000\u0000QR\u0005c\u0000\u0000RS\u0005"+
 		"k\u0000\u0000ST\u0005a\u0000\u0000TU\u0005g\u0000\u0000UV\u0005e\u0000"+
 		"\u0000V\u0002\u0001\u0000\u0000\u0000WX\u0005i\u0000\u0000XY\u0005n\u0000"+
 		"\u0000YZ\u0005t\u0000\u0000Z[\u0005e\u0000\u0000[\\\u0005r\u0000\u0000"+
@@ -228,105 +228,103 @@ public class WinxLexer extends Lexer {
 		"\u0000\u0000\u0000z{\u0005@\u0000\u0000{\n\u0001\u0000\u0000\u0000|}\u0005"+
 		"r\u0000\u0000}~\u0005e\u0000\u0000~\u007f\u0005s\u0000\u0000\u007f\u0080"+
 		"\u0005u\u0000\u0000\u0080\u0081\u0005l\u0000\u0000\u0081\u0082\u0005t"+
-		"\u0000\u0000\u0082\f\u0001\u0000\u0000\u0000\u0083\u0084\u0005A\u0000"+
-		"\u0000\u0084\u0085\u0005N\u0000\u0000\u0085\u0086\u0005D\u0000\u0000\u0086"+
-		"\u000e\u0001\u0000\u0000\u0000\u0087\u0088\u0005O\u0000\u0000\u0088\u0089"+
-		"\u0005R\u0000\u0000\u0089\u0010\u0001\u0000\u0000\u0000\u008a\u008b\u0005"+
-		"r\u0000\u0000\u008b\u008c\u0005e\u0000\u0000\u008c\u008d\u0005t\u0000"+
-		"\u0000\u008d\u008e\u0005u\u0000\u0000\u008e\u008f\u0005r\u0000\u0000\u008f"+
-		"\u0090\u0005n\u0000\u0000\u0090\u0012\u0001\u0000\u0000\u0000\u0091\u0092"+
-		"\u0005[\u0000\u0000\u0092\u0093\u0005]\u0000\u0000\u0093\u0014\u0001\u0000"+
-		"\u0000\u0000\u0094\u0095\u0005c\u0000\u0000\u0095\u0096\u0005r\u0000\u0000"+
-		"\u0096\u0097\u0005i\u0000\u0000\u0097\u0098\u0005t\u0000\u0000\u0098\u0099"+
-		"\u0005i\u0000\u0000\u0099\u009a\u0005c\u0000\u0000\u009a\u009b\u0005a"+
-		"\u0000\u0000\u009b\u009c\u0005l\u0000\u0000\u009c\u0016\u0001\u0000\u0000"+
-		"\u0000\u009d\u009e\u0005o\u0000\u0000\u009e\u009f\u0005p\u0000\u0000\u009f"+
-		"\u00a0\u0005t\u0000\u0000\u00a0\u00a1\u0005i\u0000\u0000\u00a1\u00a2\u0005"+
-		"o\u0000\u0000\u00a2\u00a3\u0005n\u0000\u0000\u00a3\u00a4\u0005a\u0000"+
-		"\u0000\u00a4\u00a5\u0005l\u0000\u0000\u00a5\u0018\u0001\u0000\u0000\u0000"+
-		"\u00a6\u00a7\u0005I\u0000\u0000\u00a7\u00a8\u0005N\u0000\u0000\u00a8\u00a9"+
-		"\u0005T\u0000\u0000\u00a9\u001a\u0001\u0000\u0000\u0000\u00aa\u00ab\u0005"+
-		"F\u0000\u0000\u00ab\u00ac\u0005L\u0000\u0000\u00ac\u00ad\u0005O\u0000"+
-		"\u0000\u00ad\u00ae\u0005A\u0000\u0000\u00ae\u00af\u0005T\u0000\u0000\u00af"+
-		"\u001c\u0001\u0000\u0000\u0000\u00b0\u00b1\u0005D\u0000\u0000\u00b1\u00b2"+
-		"\u0005O\u0000\u0000\u00b2\u00b3\u0005U\u0000\u0000\u00b3\u00b4\u0005B"+
-		"\u0000\u0000\u00b4\u00b5\u0005L\u0000\u0000\u00b5\u00b6\u0005E\u0000\u0000"+
-		"\u00b6\u001e\u0001\u0000\u0000\u0000\u00b7\u00b8\u0005S\u0000\u0000\u00b8"+
-		"\u00b9\u0005T\u0000\u0000\u00b9\u00ba\u0005R\u0000\u0000\u00ba\u00bb\u0005"+
-		"I\u0000\u0000\u00bb\u00bc\u0005N\u0000\u0000\u00bc\u00bd\u0005G\u0000"+
-		"\u0000\u00bd \u0001\u0000\u0000\u0000\u00be\u00bf\u0005B\u0000\u0000\u00bf"+
-		"\u00c0\u0005O\u0000\u0000\u00c0\u00c1\u0005O\u0000\u0000\u00c1\u00c2\u0005"+
-		"L\u0000\u0000\u00c2\u00c3\u0005E\u0000\u0000\u00c3\u00c4\u0005A\u0000"+
-		"\u0000\u00c4\u00c5\u0005N\u0000\u0000\u00c5\"\u0001\u0000\u0000\u0000"+
-		"\u00c6\u00c7\u0005C\u0000\u0000\u00c7\u00c8\u0005H\u0000\u0000\u00c8\u00c9"+
-		"\u0005A\u0000\u0000\u00c9\u00ca\u0005R\u0000\u0000\u00ca$\u0001\u0000"+
-		"\u0000\u0000\u00cb\u00cc\u0005V\u0000\u0000\u00cc\u00cd\u0005O\u0000\u0000"+
-		"\u00cd\u00ce\u0005I\u0000\u0000\u00ce\u00cf\u0005D\u0000\u0000\u00cf&"+
-		"\u0001\u0000\u0000\u0000\u00d0\u00d1\u0005p\u0000\u0000\u00d1\u00d2\u0005"+
-		"u\u0000\u0000\u00d2\u00d3\u0005b\u0000\u0000\u00d3\u00d4\u0005l\u0000"+
-		"\u0000\u00d4\u00d5\u0005i\u0000\u0000\u00d5\u00d6\u0005c\u0000\u0000\u00d6"+
-		"(\u0001\u0000\u0000\u0000\u00d7\u00d8\u0005p\u0000\u0000\u00d8\u00d9\u0005"+
-		"r\u0000\u0000\u00d9\u00da\u0005o\u0000\u0000\u00da\u00db\u0005t\u0000"+
-		"\u0000\u00db\u00dc\u0005e\u0000\u0000\u00dc\u00dd\u0005c\u0000\u0000\u00dd"+
-		"\u00de\u0005t\u0000\u0000\u00de\u00df\u0005e\u0000\u0000\u00df\u00e0\u0005"+
-		"d\u0000\u0000\u00e0*\u0001\u0000\u0000\u0000\u00e1\u00e2\u0005p\u0000"+
-		"\u0000\u00e2\u00e3\u0005r\u0000\u0000\u00e3\u00e4\u0005i\u0000\u0000\u00e4"+
-		"\u00e5\u0005v\u0000\u0000\u00e5\u00e6\u0005a\u0000\u0000\u00e6\u00e7\u0005"+
-		"t\u0000\u0000\u00e7\u00e8\u0005e\u0000\u0000\u00e8,\u0001\u0000\u0000"+
-		"\u0000\u00e9\u00ea\u0005d\u0000\u0000\u00ea\u00eb\u0005e\u0000\u0000\u00eb"+
-		"\u00ec\u0005f\u0000\u0000\u00ec\u00ed\u0005a\u0000\u0000\u00ed\u00ee\u0005"+
-		"u\u0000\u0000\u00ee\u00ef\u0005l\u0000\u0000\u00ef\u00f0\u0005t\u0000"+
-		"\u0000\u00f0.\u0001\u0000\u0000\u0000\u00f1\u00f3\u0007\u0000\u0000\u0000"+
-		"\u00f2\u00f1\u0001\u0000\u0000\u0000\u00f3\u00f4\u0001\u0000\u0000\u0000"+
-		"\u00f4\u00f2\u0001\u0000\u0000\u0000\u00f4\u00f5\u0001\u0000\u0000\u0000"+
-		"\u00f50\u0001\u0000\u0000\u0000\u00f6\u00fa\u0005\"\u0000\u0000\u00f7"+
-		"\u00f9\b\u0001\u0000\u0000\u00f8\u00f7\u0001\u0000\u0000\u0000\u00f9\u00fc"+
-		"\u0001\u0000\u0000\u0000\u00fa\u00f8\u0001\u0000\u0000\u0000\u00fa\u00fb"+
-		"\u0001\u0000\u0000\u0000\u00fb\u00fd\u0001\u0000\u0000\u0000\u00fc\u00fa"+
-		"\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005\"\u0000\u0000\u00fe2\u0001"+
-		"\u0000\u0000\u0000\u00ff\u0101\u0007\u0002\u0000\u0000\u0100\u00ff\u0001"+
-		"\u0000\u0000\u0000\u0101\u0102\u0001\u0000\u0000\u0000\u0102\u0100\u0001"+
-		"\u0000\u0000\u0000\u0102\u0103\u0001\u0000\u0000\u0000\u0103\u0104\u0001"+
-		"\u0000\u0000\u0000\u0104\u0105\u0006\u0019\u0000\u0000\u01054\u0001\u0000"+
-		"\u0000\u0000\u0106\u010a\u0005~\u0000\u0000\u0107\u0109\b\u0003\u0000"+
-		"\u0000\u0108\u0107\u0001\u0000\u0000\u0000\u0109\u010c\u0001\u0000\u0000"+
-		"\u0000\u010a\u010b\u0001\u0000\u0000\u0000\u010a\u0108\u0001\u0000\u0000"+
-		"\u0000\u010b\u010d\u0001\u0000\u0000\u0000\u010c\u010a\u0001\u0000\u0000"+
-		"\u0000\u010d\u0119\u0005~\u0000\u0000\u010e\u010f\u0005/\u0000\u0000\u010f"+
-		"\u0110\u0005/\u0000\u0000\u0110\u0114\u0001\u0000\u0000\u0000\u0111\u0113"+
-		"\b\u0002\u0000\u0000\u0112\u0111\u0001\u0000\u0000\u0000\u0113\u0116\u0001"+
-		"\u0000\u0000\u0000\u0114\u0112\u0001\u0000\u0000\u0000\u0114\u0115\u0001"+
-		"\u0000\u0000\u0000\u0115\u0117\u0001\u0000\u0000\u0000\u0116\u0114\u0001"+
-		"\u0000\u0000\u0000\u0117\u0119\u00033\u0019\u0000\u0118\u0106\u0001\u0000"+
-		"\u0000\u0000\u0118\u010e\u0001\u0000\u0000\u0000\u01196\u0001\u0000\u0000"+
-		"\u0000\u011a\u011c\u0007\u0004\u0000\u0000\u011b\u011a\u0001\u0000\u0000"+
+		"\u0000\u0000\u0082\f\u0001\u0000\u0000\u0000\u0083\u0084\u0005r\u0000"+
+		"\u0000\u0084\u0085\u0005e\u0000\u0000\u0085\u0086\u0005t\u0000\u0000\u0086"+
+		"\u0087\u0005u\u0000\u0000\u0087\u0088\u0005r\u0000\u0000\u0088\u0089\u0005"+
+		"n\u0000\u0000\u0089\u000e\u0001\u0000\u0000\u0000\u008a\u008b\u0005[\u0000"+
+		"\u0000\u008b\u008c\u0005]\u0000\u0000\u008c\u0010\u0001\u0000\u0000\u0000"+
+		"\u008d\u008e\u0005c\u0000\u0000\u008e\u008f\u0005r\u0000\u0000\u008f\u0090"+
+		"\u0005i\u0000\u0000\u0090\u0091\u0005t\u0000\u0000\u0091\u0092\u0005i"+
+		"\u0000\u0000\u0092\u0093\u0005c\u0000\u0000\u0093\u0094\u0005a\u0000\u0000"+
+		"\u0094\u0095\u0005l\u0000\u0000\u0095\u0012\u0001\u0000\u0000\u0000\u0096"+
+		"\u0097\u0005o\u0000\u0000\u0097\u0098\u0005p\u0000\u0000\u0098\u0099\u0005"+
+		"t\u0000\u0000\u0099\u009a\u0005i\u0000\u0000\u009a\u009b\u0005o\u0000"+
+		"\u0000\u009b\u009c\u0005n\u0000\u0000\u009c\u009d\u0005a\u0000\u0000\u009d"+
+		"\u009e\u0005l\u0000\u0000\u009e\u0014\u0001\u0000\u0000\u0000\u009f\u00a0"+
+		"\u0005I\u0000\u0000\u00a0\u00a1\u0005N\u0000\u0000\u00a1\u00a2\u0005T"+
+		"\u0000\u0000\u00a2\u0016\u0001\u0000\u0000\u0000\u00a3\u00a4\u0005F\u0000"+
+		"\u0000\u00a4\u00a5\u0005L\u0000\u0000\u00a5\u00a6\u0005O\u0000\u0000\u00a6"+
+		"\u00a7\u0005A\u0000\u0000\u00a7\u00a8\u0005T\u0000\u0000\u00a8\u0018\u0001"+
+		"\u0000\u0000\u0000\u00a9\u00aa\u0005D\u0000\u0000\u00aa\u00ab\u0005O\u0000"+
+		"\u0000\u00ab\u00ac\u0005U\u0000\u0000\u00ac\u00ad\u0005B\u0000\u0000\u00ad"+
+		"\u00ae\u0005L\u0000\u0000\u00ae\u00af\u0005E\u0000\u0000\u00af\u001a\u0001"+
+		"\u0000\u0000\u0000\u00b0\u00b1\u0005S\u0000\u0000\u00b1\u00b2\u0005T\u0000"+
+		"\u0000\u00b2\u00b3\u0005R\u0000\u0000\u00b3\u00b4\u0005I\u0000\u0000\u00b4"+
+		"\u00b5\u0005N\u0000\u0000\u00b5\u00b6\u0005G\u0000\u0000\u00b6\u001c\u0001"+
+		"\u0000\u0000\u0000\u00b7\u00b8\u0005B\u0000\u0000\u00b8\u00b9\u0005O\u0000"+
+		"\u0000\u00b9\u00ba\u0005O\u0000\u0000\u00ba\u00bb\u0005L\u0000\u0000\u00bb"+
+		"\u00bc\u0005E\u0000\u0000\u00bc\u00bd\u0005A\u0000\u0000\u00bd\u00be\u0005"+
+		"N\u0000\u0000\u00be\u001e\u0001\u0000\u0000\u0000\u00bf\u00c0\u0005C\u0000"+
+		"\u0000\u00c0\u00c1\u0005H\u0000\u0000\u00c1\u00c2\u0005A\u0000\u0000\u00c2"+
+		"\u00c3\u0005R\u0000\u0000\u00c3 \u0001\u0000\u0000\u0000\u00c4\u00c5\u0005"+
+		"V\u0000\u0000\u00c5\u00c6\u0005O\u0000\u0000\u00c6\u00c7\u0005I\u0000"+
+		"\u0000\u00c7\u00c8\u0005D\u0000\u0000\u00c8\"\u0001\u0000\u0000\u0000"+
+		"\u00c9\u00ca\u0005p\u0000\u0000\u00ca\u00cb\u0005u\u0000\u0000\u00cb\u00cc"+
+		"\u0005b\u0000\u0000\u00cc\u00cd\u0005l\u0000\u0000\u00cd\u00ce\u0005i"+
+		"\u0000\u0000\u00ce\u00cf\u0005c\u0000\u0000\u00cf$\u0001\u0000\u0000\u0000"+
+		"\u00d0\u00d1\u0005p\u0000\u0000\u00d1\u00d2\u0005r\u0000\u0000\u00d2\u00d3"+
+		"\u0005o\u0000\u0000\u00d3\u00d4\u0005t\u0000\u0000\u00d4\u00d5\u0005e"+
+		"\u0000\u0000\u00d5\u00d6\u0005c\u0000\u0000\u00d6\u00d7\u0005t\u0000\u0000"+
+		"\u00d7\u00d8\u0005e\u0000\u0000\u00d8\u00d9\u0005d\u0000\u0000\u00d9&"+
+		"\u0001\u0000\u0000\u0000\u00da\u00db\u0005p\u0000\u0000\u00db\u00dc\u0005"+
+		"r\u0000\u0000\u00dc\u00dd\u0005i\u0000\u0000\u00dd\u00de\u0005v\u0000"+
+		"\u0000\u00de\u00df\u0005a\u0000\u0000\u00df\u00e0\u0005t\u0000\u0000\u00e0"+
+		"\u00e1\u0005e\u0000\u0000\u00e1(\u0001\u0000\u0000\u0000\u00e2\u00e3\u0005"+
+		"d\u0000\u0000\u00e3\u00e4\u0005e\u0000\u0000\u00e4\u00e5\u0005f\u0000"+
+		"\u0000\u00e5\u00e6\u0005a\u0000\u0000\u00e6\u00e7\u0005u\u0000\u0000\u00e7"+
+		"\u00e8\u0005l\u0000\u0000\u00e8\u00e9\u0005t\u0000\u0000\u00e9*\u0001"+
+		"\u0000\u0000\u0000\u00ea\u00eb\u0005A\u0000\u0000\u00eb\u00ec\u0005N\u0000"+
+		"\u0000\u00ec\u00ed\u0005D\u0000\u0000\u00ed,\u0001\u0000\u0000\u0000\u00ee"+
+		"\u00ef\u0005O\u0000\u0000\u00ef\u00f0\u0005R\u0000\u0000\u00f0.\u0001"+
+		"\u0000\u0000\u0000\u00f1\u00f3\u0007\u0000\u0000\u0000\u00f2\u00f1\u0001"+
+		"\u0000\u0000\u0000\u00f3\u00f4\u0001\u0000\u0000\u0000\u00f4\u00f2\u0001"+
+		"\u0000\u0000\u0000\u00f4\u00f5\u0001\u0000\u0000\u0000\u00f50\u0001\u0000"+
+		"\u0000\u0000\u00f6\u00f8\u0007\u0001\u0000\u0000\u00f7\u00f6\u0001\u0000"+
+		"\u0000\u0000\u00f8\u00f9\u0001\u0000\u0000\u0000\u00f9\u00f7\u0001\u0000"+
+		"\u0000\u0000\u00f9\u00fa\u0001\u0000\u0000\u0000\u00fa2\u0001\u0000\u0000"+
+		"\u0000\u00fb\u00fd\u0007\u0001\u0000\u0000\u00fc\u00fb\u0001\u0000\u0000"+
+		"\u0000\u00fd\u00fe\u0001\u0000\u0000\u0000\u00fe\u00fc\u0001\u0000\u0000"+
+		"\u0000\u00fe\u00ff\u0001\u0000\u0000\u0000\u00ff\u0100\u0001\u0000\u0000"+
+		"\u0000\u0100\u0104\u0005.\u0000\u0000\u0101\u0103\u0007\u0001\u0000\u0000"+
+		"\u0102\u0101\u0001\u0000\u0000\u0000\u0103\u0106\u0001\u0000\u0000\u0000"+
+		"\u0104\u0102\u0001\u0000\u0000\u0000\u0104\u0105\u0001\u0000\u0000\u0000"+
+		"\u0105\u010e\u0001\u0000\u0000\u0000\u0106\u0104\u0001\u0000\u0000\u0000"+
+		"\u0107\u0109\u0005.\u0000\u0000\u0108\u010a\u0007\u0001\u0000\u0000\u0109"+
+		"\u0108\u0001\u0000\u0000\u0000\u010a\u010b\u0001\u0000\u0000\u0000\u010b"+
+		"\u0109\u0001\u0000\u0000\u0000\u010b\u010c\u0001\u0000\u0000\u0000\u010c"+
+		"\u010e\u0001\u0000\u0000\u0000\u010d\u00fc\u0001\u0000\u0000\u0000\u010d"+
+		"\u0107\u0001\u0000\u0000\u0000\u010e4\u0001\u0000\u0000\u0000\u010f\u0115"+
+		"\u0005\"\u0000\u0000\u0110\u0111\u0005\\\u0000\u0000\u0111\u0114\u0007"+
+		"\u0002\u0000\u0000\u0112\u0114\b\u0002\u0000\u0000\u0113\u0110\u0001\u0000"+
+		"\u0000\u0000\u0113\u0112\u0001\u0000\u0000\u0000\u0114\u0117\u0001\u0000"+
+		"\u0000\u0000\u0115\u0113\u0001\u0000\u0000\u0000\u0115\u0116\u0001\u0000"+
+		"\u0000\u0000\u0116\u0118\u0001\u0000\u0000\u0000\u0117\u0115\u0001\u0000"+
+		"\u0000\u0000\u0118\u0119\u0005\"\u0000\u0000\u01196\u0001\u0000\u0000"+
+		"\u0000\u011a\u011c\u0007\u0003\u0000\u0000\u011b\u011a\u0001\u0000\u0000"+
 		"\u0000\u011c\u011d\u0001\u0000\u0000\u0000\u011d\u011b\u0001\u0000\u0000"+
 		"\u0000\u011d\u011e\u0001\u0000\u0000\u0000\u011e\u011f\u0001\u0000\u0000"+
 		"\u0000\u011f\u0120\u0006\u001b\u0000\u0000\u01208\u0001\u0000\u0000\u0000"+
-		"\u0121\u0123\u0007\u0005\u0000\u0000\u0122\u0121\u0001\u0000\u0000\u0000"+
-		"\u0123\u0124\u0001\u0000\u0000\u0000\u0124\u0122\u0001\u0000\u0000\u0000"+
-		"\u0124\u0125\u0001\u0000\u0000\u0000\u0125:\u0001\u0000\u0000\u0000\u0126"+
-		"\u0128\u0007\u0005\u0000\u0000\u0127\u0126\u0001\u0000\u0000\u0000\u0128"+
-		"\u0129\u0001\u0000\u0000\u0000\u0129\u0127\u0001\u0000\u0000\u0000\u0129"+
-		"\u012a\u0001\u0000\u0000\u0000\u012a\u012b\u0001\u0000\u0000\u0000\u012b"+
-		"\u012f\u0005.\u0000\u0000\u012c\u012e\u0007\u0005\u0000\u0000\u012d\u012c"+
-		"\u0001\u0000\u0000\u0000\u012e\u0131\u0001\u0000\u0000\u0000\u012f\u012d"+
-		"\u0001\u0000\u0000\u0000\u012f\u0130\u0001\u0000\u0000\u0000\u0130\u0139"+
-		"\u0001\u0000\u0000\u0000\u0131\u012f\u0001\u0000\u0000\u0000\u0132\u0134"+
-		"\u0005.\u0000\u0000\u0133\u0135\u0007\u0005\u0000\u0000\u0134\u0133\u0001"+
-		"\u0000\u0000\u0000\u0135\u0136\u0001\u0000\u0000\u0000\u0136\u0134\u0001"+
-		"\u0000\u0000\u0000\u0136\u0137\u0001\u0000\u0000\u0000\u0137\u0139\u0001"+
-		"\u0000\u0000\u0000\u0138\u0127\u0001\u0000\u0000\u0000\u0138\u0132\u0001"+
-		"\u0000\u0000\u0000\u0139<\u0001\u0000\u0000\u0000\u013a\u013b\u0005(\u0000"+
-		"\u0000\u013b>\u0001\u0000\u0000\u0000\u013c\u013d\u0005)\u0000\u0000\u013d"+
-		"@\u0001\u0000\u0000\u0000\u013e\u013f\u0005:\u0000\u0000\u013fB\u0001"+
-		"\u0000\u0000\u0000\u0140\u0141\u0005;\u0000\u0000\u0141D\u0001\u0000\u0000"+
-		"\u0000\u0142\u0143\u0005,\u0000\u0000\u0143F\u0001\u0000\u0000\u0000\u0144"+
-		"\u0145\u0005{\u0000\u0000\u0145H\u0001\u0000\u0000\u0000\u0146\u0147\u0005"+
-		"}\u0000\u0000\u0147J\u0001\u0000\u0000\u0000\u0148\u0149\u0005~\u0000"+
-		"\u0000\u0149L\u0001\u0000\u0000\u0000\u014a\u014b\u0005!\u0000\u0000\u014b"+
-		"N\u0001\u0000\u0000\u0000\r\u0000\u00f4\u00fa\u0102\u010a\u0114\u0118"+
-		"\u011d\u0124\u0129\u012f\u0136\u0138\u0001\u0006\u0000\u0000";
+		"\u0121\u0125\u0005~\u0000\u0000\u0122\u0124\t\u0000\u0000\u0000\u0123"+
+		"\u0122\u0001\u0000\u0000\u0000\u0124\u0127\u0001\u0000\u0000\u0000\u0125"+
+		"\u0126\u0001\u0000\u0000\u0000\u0125\u0123\u0001\u0000\u0000\u0000\u0126"+
+		"\u0128\u0001\u0000\u0000\u0000\u0127\u0125\u0001\u0000\u0000\u0000\u0128"+
+		"\u0129\u0005~\u0000\u0000\u0129\u012a\u0001\u0000\u0000\u0000\u012a\u012b"+
+		"\u0006\u001c\u0001\u0000\u012b:\u0001\u0000\u0000\u0000\u012c\u012d\u0005"+
+		"/\u0000\u0000\u012d\u012e\u0005/\u0000\u0000\u012e\u0132\u0001\u0000\u0000"+
+		"\u0000\u012f\u0131\b\u0004\u0000\u0000\u0130\u012f\u0001\u0000\u0000\u0000"+
+		"\u0131\u0134\u0001\u0000\u0000\u0000\u0132\u0130\u0001\u0000\u0000\u0000"+
+		"\u0132\u0133\u0001\u0000\u0000\u0000\u0133\u0135\u0001\u0000\u0000\u0000"+
+		"\u0134\u0132\u0001\u0000\u0000\u0000\u0135\u0136\u0006\u001d\u0001\u0000"+
+		"\u0136<\u0001\u0000\u0000\u0000\u0137\u0138\u0005(\u0000\u0000\u0138>"+
+		"\u0001\u0000\u0000\u0000\u0139\u013a\u0005)\u0000\u0000\u013a@\u0001\u0000"+
+		"\u0000\u0000\u013b\u013c\u0005:\u0000\u0000\u013cB\u0001\u0000\u0000\u0000"+
+		"\u013d\u013e\u0005;\u0000\u0000\u013eD\u0001\u0000\u0000\u0000\u013f\u0140"+
+		"\u0005,\u0000\u0000\u0140F\u0001\u0000\u0000\u0000\u0141\u0142\u0005{"+
+		"\u0000\u0000\u0142H\u0001\u0000\u0000\u0000\u0143\u0144\u0005}\u0000\u0000"+
+		"\u0144J\u0001\u0000\u0000\u0000\u0145\u0146\u0005~\u0000\u0000\u0146L"+
+		"\u0001\u0000\u0000\u0000\u0147\u0148\u0005!\u0000\u0000\u0148N\u0001\u0000"+
+		"\u0000\u0000\f\u0000\u00f4\u00f9\u00fe\u0104\u010b\u010d\u0113\u0115\u011d"+
+		"\u0125\u0132\u0002\u0006\u0000\u0000\u0000\u0001\u0000";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/org/lumijiez/parser/WinxLexer.tokens b/src/main/java/org/lumijiez/parser/WinxLexer.tokens
index 811296c..044435d 100644
--- a/src/main/java/org/lumijiez/parser/WinxLexer.tokens
+++ b/src/main/java/org/lumijiez/parser/WinxLexer.tokens
@@ -22,12 +22,12 @@ T__20=21
 T__21=22
 T__22=23
 ID=24
-STRING=25
-NEWLINE=26
-COMMENT=27
+INT=25
+FLOAT=26
+STRING=27
 WS=28
-INT=29
-FLOAT=30
+COMMENT=29
+LINE_COMMENT=30
 LPAREN=31
 RPAREN=32
 COLON=33
@@ -43,23 +43,23 @@ EXCLAM=39
 'implements'=4
 '@'=5
 'result'=6
-'AND'=7
-'OR'=8
-'return'=9
-'[]'=10
-'critical'=11
-'optional'=12
-'INT'=13
-'FLOAT'=14
-'DOUBLE'=15
-'STRING'=16
-'BOOLEAN'=17
-'CHAR'=18
-'VOID'=19
-'public'=20
-'protected'=21
-'private'=22
-'default'=23
+'return'=7
+'[]'=8
+'critical'=9
+'optional'=10
+'INT'=11
+'FLOAT'=12
+'DOUBLE'=13
+'STRING'=14
+'BOOLEAN'=15
+'CHAR'=16
+'VOID'=17
+'public'=18
+'protected'=19
+'private'=20
+'default'=21
+'AND'=22
+'OR'=23
 '('=31
 ')'=32
 ':'=33
diff --git a/src/main/java/org/lumijiez/parser/WinxListener.java b/src/main/java/org/lumijiez/parser/WinxListener.java
index 64adfd7..0392ce6 100644
--- a/src/main/java/org/lumijiez/parser/WinxListener.java
+++ b/src/main/java/org/lumijiez/parser/WinxListener.java
@@ -17,16 +17,6 @@ public interface WinxListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitWinx(WinxParser.WinxContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link WinxParser#body}.
-	 * @param ctx the parse tree
-	 */
-	void enterBody(WinxParser.BodyContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link WinxParser#body}.
-	 * @param ctx the parse tree
-	 */
-	void exitBody(WinxParser.BodyContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WinxParser#package}.
 	 * @param ctx the parse tree
@@ -37,6 +27,16 @@ public interface WinxListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitPackage(WinxParser.PackageContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link WinxParser#body}.
+	 * @param ctx the parse tree
+	 */
+	void enterBody(WinxParser.BodyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link WinxParser#body}.
+	 * @param ctx the parse tree
+	 */
+	void exitBody(WinxParser.BodyContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WinxParser#interface}.
 	 * @param ctx the parse tree
@@ -57,6 +57,16 @@ public interface WinxListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitSpecification(WinxParser.SpecificationContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link WinxParser#impls}.
+	 * @param ctx the parse tree
+	 */
+	void enterImpls(WinxParser.ImplsContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link WinxParser#impls}.
+	 * @param ctx the parse tree
+	 */
+	void exitImpls(WinxParser.ImplsContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WinxParser#spec_body}.
 	 * @param ctx the parse tree
@@ -97,16 +107,6 @@ public interface WinxListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitResult_specification(WinxParser.Result_specificationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link WinxParser#logical_op}.
-	 * @param ctx the parse tree
-	 */
-	void enterLogical_op(WinxParser.Logical_opContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link WinxParser#logical_op}.
-	 * @param ctx the parse tree
-	 */
-	void exitLogical_op(WinxParser.Logical_opContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WinxParser#function_spec}.
 	 * @param ctx the parse tree
@@ -138,15 +138,15 @@ public interface WinxListener extends ParseTreeListener {
 	 */
 	void exitInput_types(WinxParser.Input_typesContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link WinxParser#return_types}.
+	 * Enter a parse tree produced by {@link WinxParser#return_type}.
 	 * @param ctx the parse tree
 	 */
-	void enterReturn_types(WinxParser.Return_typesContext ctx);
+	void enterReturn_type(WinxParser.Return_typeContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link WinxParser#return_types}.
+	 * Exit a parse tree produced by {@link WinxParser#return_type}.
 	 * @param ctx the parse tree
 	 */
-	void exitReturn_types(WinxParser.Return_typesContext ctx);
+	void exitReturn_type(WinxParser.Return_typeContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WinxParser#specification_entry}.
 	 * @param ctx the parse tree
@@ -198,13 +198,13 @@ public interface WinxListener extends ParseTreeListener {
 	 */
 	void exitAccess_modifiers(WinxParser.Access_modifiersContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link WinxParser#comment}.
+	 * Enter a parse tree produced by {@link WinxParser#logical_op}.
 	 * @param ctx the parse tree
 	 */
-	void enterComment(WinxParser.CommentContext ctx);
+	void enterLogical_op(WinxParser.Logical_opContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link WinxParser#comment}.
+	 * Exit a parse tree produced by {@link WinxParser#logical_op}.
 	 * @param ctx the parse tree
 	 */
-	void exitComment(WinxParser.CommentContext ctx);
+	void exitLogical_op(WinxParser.Logical_opContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/WinxParser.java b/src/main/java/org/lumijiez/parser/WinxParser.java
index e40d824..54f5f10 100644
--- a/src/main/java/org/lumijiez/parser/WinxParser.java
+++ b/src/main/java/org/lumijiez/parser/WinxParser.java
@@ -1,17 +1,13 @@
 // Generated from D:/Source/JavaProjects/dsl-formal-requirements/src/grammars/Winx.g4 by ANTLR 4.13.1
 package org.lumijiez.parser;
-
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
+import org.antlr.v4.runtime.tree.*;
 import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
 public class WinxParser extends Parser {
@@ -23,22 +19,22 @@ public class WinxParser extends Parser {
 	public static final int
 		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
 		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, ID=24, STRING=25, 
-		NEWLINE=26, COMMENT=27, WS=28, INT=29, FLOAT=30, LPAREN=31, RPAREN=32, 
+		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, ID=24, INT=25, 
+		FLOAT=26, STRING=27, WS=28, COMMENT=29, LINE_COMMENT=30, LPAREN=31, RPAREN=32, 
 		COLON=33, SEMICOLON=34, COMMA=35, LBRACE=36, RBRACE=37, TILDE=38, EXCLAM=39;
 	public static final int
-		RULE_winx = 0, RULE_body = 1, RULE_package = 2, RULE_interface = 3, RULE_specification = 4, 
-		RULE_spec_body = 5, RULE_requirement_spec = 6, RULE_req_specification = 7, 
-		RULE_result_specification = 8, RULE_logical_op = 9, RULE_function_spec = 10, 
-		RULE_function_body = 11, RULE_input_types = 12, RULE_return_types = 13, 
-		RULE_specification_entry = 14, RULE_variable = 15, RULE_importance = 16, 
-		RULE_type = 17, RULE_access_modifiers = 18, RULE_comment = 19;
+		RULE_winx = 0, RULE_package = 1, RULE_body = 2, RULE_interface = 3, RULE_specification = 4, 
+		RULE_impls = 5, RULE_spec_body = 6, RULE_requirement_spec = 7, RULE_req_specification = 8, 
+		RULE_result_specification = 9, RULE_function_spec = 10, RULE_function_body = 11, 
+		RULE_input_types = 12, RULE_return_type = 13, RULE_specification_entry = 14, 
+		RULE_variable = 15, RULE_importance = 16, RULE_type = 17, RULE_access_modifiers = 18, 
+		RULE_logical_op = 19;
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"winx", "body", "package", "interface", "specification", "spec_body", 
-			"requirement_spec", "req_specification", "result_specification", "logical_op", 
-			"function_spec", "function_body", "input_types", "return_types", "specification_entry", 
-			"variable", "importance", "type", "access_modifiers", "comment"
+			"winx", "package", "body", "interface", "specification", "impls", "spec_body", 
+			"requirement_spec", "req_specification", "result_specification", "function_spec", 
+			"function_body", "input_types", "return_type", "specification_entry", 
+			"variable", "importance", "type", "access_modifiers", "logical_op"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -46,11 +42,11 @@ public class WinxParser extends Parser {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'package'", "'interface'", "'specification'", "'implements'", 
-			"'@'", "'result'", "'AND'", "'OR'", "'return'", "'[]'", "'critical'", 
-			"'optional'", "'INT'", "'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", 
-			"'CHAR'", "'VOID'", "'public'", "'protected'", "'private'", "'default'", 
-			null, null, null, null, null, null, null, "'('", "')'", "':'", "';'", 
-			"','", "'{'", "'}'", "'~'", "'!'"
+			"'@'", "'result'", "'return'", "'[]'", "'critical'", "'optional'", "'INT'", 
+			"'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", "'CHAR'", "'VOID'", "'public'", 
+			"'protected'", "'private'", "'default'", "'AND'", "'OR'", null, null, 
+			null, null, null, null, null, "'('", "')'", "':'", "';'", "','", "'{'", 
+			"'}'", "'~'", "'!'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -58,7 +54,7 @@ public class WinxParser extends Parser {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			"ID", "STRING", "NEWLINE", "COMMENT", "WS", "INT", "FLOAT", "LPAREN", 
+			"ID", "INT", "FLOAT", "STRING", "WS", "COMMENT", "LINE_COMMENT", "LPAREN", 
 			"RPAREN", "COLON", "SEMICOLON", "COMMA", "LBRACE", "RBRACE", "TILDE", 
 			"EXCLAM"
 		};
@@ -122,10 +118,6 @@ public class WinxParser extends Parser {
 		public PackageContext package_(int i) {
 			return getRuleContext(PackageContext.class,i);
 		}
-		public List<TerminalNode> COMMENT() { return getTokens(WinxParser.COMMENT); }
-		public TerminalNode COMMENT(int i) {
-			return getToken(WinxParser.COMMENT, i);
-		}
 		public WinxContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -152,131 +144,20 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(42); 
+			setState(41); 
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			do {
 				{
-				setState(42);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case T__0:
-					{
-					setState(40);
-					package_();
-					}
-					break;
-				case COMMENT:
-					{
-					setState(41);
-					match(COMMENT);
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
-				}
-				}
-				setState(44); 
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			} while ( _la==T__0 || _la==COMMENT );
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class BodyContext extends ParserRuleContext {
-		public List<InterfaceContext> interface_() {
-			return getRuleContexts(InterfaceContext.class);
-		}
-		public InterfaceContext interface_(int i) {
-			return getRuleContext(InterfaceContext.class,i);
-		}
-		public List<SpecificationContext> specification() {
-			return getRuleContexts(SpecificationContext.class);
-		}
-		public SpecificationContext specification(int i) {
-			return getRuleContext(SpecificationContext.class,i);
-		}
-		public List<TerminalNode> COMMENT() { return getTokens(WinxParser.COMMENT); }
-		public TerminalNode COMMENT(int i) {
-			return getToken(WinxParser.COMMENT, i);
-		}
-		public BodyContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_body; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterBody(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitBody(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitBody(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final BodyContext body() throws RecognitionException {
-		BodyContext _localctx = new BodyContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_body);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(49); 
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			do {
 				{
-				setState(49);
-				_errHandler.sync(this);
-				switch (_input.LA(1)) {
-				case T__1:
-				case T__10:
-				case T__11:
-				case T__19:
-				case T__20:
-				case T__21:
-				case T__22:
-					{
-					setState(46);
-					interface_();
-					}
-					break;
-				case T__2:
-					{
-					setState(47);
-					specification();
-					}
-					break;
-				case COMMENT:
-					{
-					setState(48);
-					match(COMMENT);
-					}
-					break;
-				default:
-					throw new NoViableAltException(this);
+				setState(40);
+				package_();
 				}
 				}
-				setState(51); 
+				setState(43); 
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-			} while ( (((_la) & ~0x3f) == 0 && ((1L << _la) & 149952524L) != 0) );
+			} while ( _la==T__0 );
 			}
 		}
 		catch (RecognitionException re) {
@@ -319,19 +200,19 @@ public class WinxParser extends Parser {
 
 	public final PackageContext package_() throws RecognitionException {
 		PackageContext _localctx = new PackageContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_package);
+		enterRule(_localctx, 2, RULE_package);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(53);
+			setState(45);
 			match(T__0);
-			setState(54);
+			setState(46);
 			match(ID);
-			setState(55);
+			setState(47);
 			match(LBRACE);
-			setState(56);
+			setState(48);
 			body();
-			setState(57);
+			setState(49);
 			match(RBRACE);
 			}
 		}
@@ -346,6 +227,89 @@ public class WinxParser extends Parser {
 		return _localctx;
 	}
 
+	@SuppressWarnings("CheckReturnValue")
+	public static class BodyContext extends ParserRuleContext {
+		public List<InterfaceContext> interface_() {
+			return getRuleContexts(InterfaceContext.class);
+		}
+		public InterfaceContext interface_(int i) {
+			return getRuleContext(InterfaceContext.class,i);
+		}
+		public List<SpecificationContext> specification() {
+			return getRuleContexts(SpecificationContext.class);
+		}
+		public SpecificationContext specification(int i) {
+			return getRuleContext(SpecificationContext.class,i);
+		}
+		public BodyContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_body; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterBody(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitBody(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitBody(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final BodyContext body() throws RecognitionException {
+		BodyContext _localctx = new BodyContext(_ctx, getState());
+		enterRule(_localctx, 4, RULE_body);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(55);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 1548L) != 0)) {
+				{
+				setState(53);
+				_errHandler.sync(this);
+				switch (_input.LA(1)) {
+				case T__1:
+				case T__8:
+				case T__9:
+					{
+					setState(51);
+					interface_();
+					}
+					break;
+				case T__2:
+					{
+					setState(52);
+					specification();
+					}
+					break;
+				default:
+					throw new NoViableAltException(this);
+				}
+				}
+				setState(57);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	@SuppressWarnings("CheckReturnValue")
 	public static class InterfaceContext extends ParserRuleContext {
 		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
@@ -357,9 +321,6 @@ public class WinxParser extends Parser {
 		public ImportanceContext importance() {
 			return getRuleContext(ImportanceContext.class,0);
 		}
-		public Access_modifiersContext access_modifiers() {
-			return getRuleContext(Access_modifiersContext.class,0);
-		}
 		public InterfaceContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -386,35 +347,25 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(60);
+			setState(59);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__10 || _la==T__11) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(59);
+				setState(58);
 				importance();
 				}
 			}
 
-			setState(63);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 15728640L) != 0)) {
-				{
-				setState(62);
-				access_modifiers();
-				}
-			}
-
-			setState(65);
+			setState(61);
 			match(T__1);
-			setState(66);
+			setState(62);
 			match(ID);
-			setState(67);
+			setState(63);
 			match(LBRACE);
-			setState(68);
+			setState(64);
 			spec_body();
-			setState(69);
+			setState(65);
 			match(RBRACE);
 			}
 		}
@@ -431,15 +382,15 @@ public class WinxParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class SpecificationContext extends ParserRuleContext {
-		public List<TerminalNode> ID() { return getTokens(WinxParser.ID); }
-		public TerminalNode ID(int i) {
-			return getToken(WinxParser.ID, i);
-		}
+		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
 		public TerminalNode LBRACE() { return getToken(WinxParser.LBRACE, 0); }
 		public Spec_bodyContext spec_body() {
 			return getRuleContext(Spec_bodyContext.class,0);
 		}
 		public TerminalNode RBRACE() { return getToken(WinxParser.RBRACE, 0); }
+		public ImplsContext impls() {
+			return getRuleContext(ImplsContext.class,0);
+		}
 		public SpecificationContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -466,27 +417,25 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(71);
+			setState(67);
 			match(T__2);
-			setState(72);
+			setState(68);
 			match(ID);
-			setState(75);
+			setState(70);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(73);
-				match(T__3);
-				setState(74);
-				match(ID);
+				setState(69);
+				impls();
 				}
 			}
 
-			setState(77);
+			setState(72);
 			match(LBRACE);
-			setState(78);
+			setState(73);
 			spec_body();
-			setState(79);
+			setState(74);
 			match(RBRACE);
 			}
 		}
@@ -501,6 +450,53 @@ public class WinxParser extends Parser {
 		return _localctx;
 	}
 
+	@SuppressWarnings("CheckReturnValue")
+	public static class ImplsContext extends ParserRuleContext {
+		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
+		public ImplsContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_impls; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterImpls(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitImpls(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitImpls(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ImplsContext impls() throws RecognitionException {
+		ImplsContext _localctx = new ImplsContext(_ctx, getState());
+		enterRule(_localctx, 10, RULE_impls);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			{
+			setState(76);
+			match(T__3);
+			setState(77);
+			match(ID);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	@SuppressWarnings("CheckReturnValue")
 	public static class Spec_bodyContext extends ParserRuleContext {
 		public List<Requirement_specContext> requirement_spec() {
@@ -536,37 +532,37 @@ public class WinxParser extends Parser {
 
 	public final Spec_bodyContext spec_body() throws RecognitionException {
 		Spec_bodyContext _localctx = new Spec_bodyContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_spec_body);
+		enterRule(_localctx, 12, RULE_spec_body);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(83); 
+			setState(83);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			do {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 20710912L) != 0)) {
 				{
-				setState(83);
+				setState(81);
 				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
+				switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
 				case 1:
 					{
-					setState(81);
+					setState(79);
 					requirement_spec();
 					}
 					break;
 				case 2:
 					{
-					setState(82);
+					setState(80);
 					function_spec();
 					}
 					break;
 				}
 				}
-				setState(85); 
+				setState(85);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-			} while ( (((_la) & ~0x3f) == 0 && ((1L << _la) & 166729728L) != 0) );
+			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -585,9 +581,6 @@ public class WinxParser extends Parser {
 		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
 		public TerminalNode LBRACE() { return getToken(WinxParser.LBRACE, 0); }
 		public TerminalNode RBRACE() { return getToken(WinxParser.RBRACE, 0); }
-		public CommentContext comment() {
-			return getRuleContext(CommentContext.class,0);
-		}
 		public ImportanceContext importance() {
 			return getRuleContext(ImportanceContext.class,0);
 		}
@@ -624,67 +617,54 @@ public class WinxParser extends Parser {
 
 	public final Requirement_specContext requirement_spec() throws RecognitionException {
 		Requirement_specContext _localctx = new Requirement_specContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_requirement_spec);
+		enterRule(_localctx, 14, RULE_requirement_spec);
 		int _la;
 		try {
-			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(88);
+			setState(87);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==COMMENT) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(87);
-				comment();
-				}
-			}
-
-			setState(91);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__10 || _la==T__11) {
-				{
-				setState(90);
+				setState(86);
 				importance();
 				}
 			}
 
-			setState(93);
+			setState(89);
 			match(ID);
-			setState(94);
+			setState(90);
 			match(LBRACE);
-			setState(98);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,11,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					{
-					{
-					setState(95);
-					req_specification();
-					}
-					} 
-				}
-				setState(100);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,11,_ctx);
-			}
-			setState(104);
+			setState(94);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__5 || _la==COMMENT) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 1568L) != 0)) {
 				{
 				{
-				setState(101);
-				result_specification();
+				setState(91);
+				req_specification();
 				}
 				}
-				setState(106);
+				setState(96);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(107);
+			setState(100);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__5) {
+				{
+				{
+				setState(97);
+				result_specification();
+				}
+				}
+				setState(102);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(103);
 			match(RBRACE);
 			}
 		}
@@ -706,9 +686,6 @@ public class WinxParser extends Parser {
 			return getToken(WinxParser.ID, i);
 		}
 		public TerminalNode SEMICOLON() { return getToken(WinxParser.SEMICOLON, 0); }
-		public CommentContext comment() {
-			return getRuleContext(CommentContext.class,0);
-		}
 		public ImportanceContext importance() {
 			return getRuleContext(ImportanceContext.class,0);
 		}
@@ -739,52 +716,42 @@ public class WinxParser extends Parser {
 
 	public final Req_specificationContext req_specification() throws RecognitionException {
 		Req_specificationContext _localctx = new Req_specificationContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_req_specification);
+		enterRule(_localctx, 16, RULE_req_specification);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(110);
+			setState(106);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==COMMENT) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(109);
-				comment();
-				}
-			}
-
-			setState(113);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__10 || _la==T__11) {
-				{
-				setState(112);
+				setState(105);
 				importance();
 				}
 			}
 
-			setState(115);
+			setState(108);
 			match(T__4);
-			setState(116);
+			setState(109);
 			match(ID);
-			setState(122);
+			setState(115);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__6 || _la==T__7) {
+			while (_la==T__21 || _la==T__22) {
 				{
 				{
-				setState(117);
+				setState(110);
 				logical_op();
-				setState(118);
+				setState(111);
 				match(ID);
 				}
 				}
-				setState(124);
+				setState(117);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(125);
+			setState(118);
 			match(SEMICOLON);
 			}
 		}
@@ -803,9 +770,6 @@ public class WinxParser extends Parser {
 	public static class Result_specificationContext extends ParserRuleContext {
 		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
 		public TerminalNode SEMICOLON() { return getToken(WinxParser.SEMICOLON, 0); }
-		public CommentContext comment() {
-			return getRuleContext(CommentContext.class,0);
-		}
 		public ImportanceContext importance() {
 			return getRuleContext(ImportanceContext.class,0);
 		}
@@ -830,36 +794,26 @@ public class WinxParser extends Parser {
 
 	public final Result_specificationContext result_specification() throws RecognitionException {
 		Result_specificationContext _localctx = new Result_specificationContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_result_specification);
+		enterRule(_localctx, 18, RULE_result_specification);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(128);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==COMMENT) {
-				{
-				setState(127);
-				comment();
-				}
-			}
-
-			setState(130);
+			setState(120);
 			match(T__5);
-			setState(132);
+			setState(122);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__10 || _la==T__11) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(131);
+				setState(121);
 				importance();
 				}
 			}
 
-			setState(134);
+			setState(124);
 			match(ID);
-			setState(135);
+			setState(125);
 			match(SEMICOLON);
 			}
 		}
@@ -874,71 +828,14 @@ public class WinxParser extends Parser {
 		return _localctx;
 	}
 
-	@SuppressWarnings("CheckReturnValue")
-	public static class Logical_opContext extends ParserRuleContext {
-		public Logical_opContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_logical_op; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterLogical_op(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitLogical_op(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitLogical_op(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final Logical_opContext logical_op() throws RecognitionException {
-		Logical_opContext _localctx = new Logical_opContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_logical_op);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(137);
-			_la = _input.LA(1);
-			if ( !(_la==T__6 || _la==T__7) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
 	@SuppressWarnings("CheckReturnValue")
 	public static class Function_specContext extends ParserRuleContext {
-		public List<TerminalNode> ID() { return getTokens(WinxParser.ID); }
-		public TerminalNode ID(int i) {
-			return getToken(WinxParser.ID, i);
-		}
+		public TerminalNode ID() { return getToken(WinxParser.ID, 0); }
 		public TerminalNode LPAREN() { return getToken(WinxParser.LPAREN, 0); }
 		public TerminalNode RPAREN() { return getToken(WinxParser.RPAREN, 0); }
 		public Function_bodyContext function_body() {
 			return getRuleContext(Function_bodyContext.class,0);
 		}
-		public CommentContext comment() {
-			return getRuleContext(CommentContext.class,0);
-		}
 		public ImportanceContext importance() {
 			return getRuleContext(ImportanceContext.class,0);
 		}
@@ -948,6 +845,9 @@ public class WinxParser extends Parser {
 		public Input_typesContext input_types() {
 			return getRuleContext(Input_typesContext.class,0);
 		}
+		public ImplsContext impls() {
+			return getRuleContext(ImplsContext.class,0);
+		}
 		public Function_specContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -974,65 +874,53 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(140);
+			setState(128);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==COMMENT) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(139);
-				comment();
-				}
-			}
-
-			setState(143);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__10 || _la==T__11) {
-				{
-				setState(142);
+				setState(127);
 				importance();
 				}
 			}
 
-			setState(146);
+			setState(131);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 15728640L) != 0)) {
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 3932160L) != 0)) {
 				{
-				setState(145);
+				setState(130);
 				access_modifiers();
 				}
 			}
 
-			setState(148);
+			setState(133);
 			match(ID);
-			setState(149);
+			setState(134);
 			match(LPAREN);
-			setState(151);
+			setState(136);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 34594816L) != 0)) {
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 134477824L) != 0)) {
 				{
-				setState(150);
+				setState(135);
 				input_types();
 				}
 			}
 
-			setState(153);
+			setState(138);
 			match(RPAREN);
-			setState(156);
+			setState(140);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__3) {
 				{
-				setState(154);
-				match(T__3);
-				setState(155);
-				match(ID);
+				setState(139);
+				impls();
 				}
 			}
 
-			setState(158);
+			setState(142);
 			function_body();
 			}
 		}
@@ -1050,8 +938,8 @@ public class WinxParser extends Parser {
 	@SuppressWarnings("CheckReturnValue")
 	public static class Function_bodyContext extends ParserRuleContext {
 		public TerminalNode LBRACE() { return getToken(WinxParser.LBRACE, 0); }
-		public Return_typesContext return_types() {
-			return getRuleContext(Return_typesContext.class,0);
+		public Return_typeContext return_type() {
+			return getRuleContext(Return_typeContext.class,0);
 		}
 		public TerminalNode RBRACE() { return getToken(WinxParser.RBRACE, 0); }
 		public List<Specification_entryContext> specification_entry() {
@@ -1086,25 +974,25 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(160);
+			setState(144);
 			match(LBRACE);
-			setState(164);
+			setState(148);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__4 || _la==COMMENT) {
+			while (_la==T__4) {
 				{
 				{
-				setState(161);
+				setState(145);
 				specification_entry();
 				}
 				}
-				setState(166);
+				setState(150);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(167);
-			return_types();
-			setState(168);
+			setState(151);
+			return_type();
+			setState(152);
 			match(RBRACE);
 			}
 		}
@@ -1157,21 +1045,21 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(170);
+			setState(154);
 			variable();
-			setState(175);
+			setState(159);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==COMMA) {
 				{
 				{
-				setState(171);
+				setState(155);
 				match(COMMA);
-				setState(172);
+				setState(156);
 				variable();
 				}
 				}
-				setState(177);
+				setState(161);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -1189,65 +1077,41 @@ public class WinxParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class Return_typesContext extends ParserRuleContext {
-		public List<VariableContext> variable() {
-			return getRuleContexts(VariableContext.class);
-		}
-		public VariableContext variable(int i) {
-			return getRuleContext(VariableContext.class,i);
+	public static class Return_typeContext extends ParserRuleContext {
+		public VariableContext variable() {
+			return getRuleContext(VariableContext.class,0);
 		}
 		public TerminalNode SEMICOLON() { return getToken(WinxParser.SEMICOLON, 0); }
-		public List<TerminalNode> COMMA() { return getTokens(WinxParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(WinxParser.COMMA, i);
-		}
-		public Return_typesContext(ParserRuleContext parent, int invokingState) {
+		public Return_typeContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_return_types; }
+		@Override public int getRuleIndex() { return RULE_return_type; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterReturn_types(this);
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterReturn_type(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitReturn_types(this);
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitReturn_type(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitReturn_types(this);
+			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitReturn_type(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final Return_typesContext return_types() throws RecognitionException {
-		Return_typesContext _localctx = new Return_typesContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_return_types);
-		int _la;
+	public final Return_typeContext return_type() throws RecognitionException {
+		Return_typeContext _localctx = new Return_typeContext(_ctx, getState());
+		enterRule(_localctx, 26, RULE_return_type);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(178);
-			match(T__8);
-			setState(179);
+			setState(162);
+			match(T__6);
+			setState(163);
 			variable();
-			setState(184);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(180);
-				match(COMMA);
-				setState(181);
-				variable();
-				}
-				}
-				setState(186);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(187);
+			setState(164);
 			match(SEMICOLON);
 			}
 		}
@@ -1268,9 +1132,6 @@ public class WinxParser extends Parser {
 		public TerminalNode COLON() { return getToken(WinxParser.COLON, 0); }
 		public TerminalNode STRING() { return getToken(WinxParser.STRING, 0); }
 		public TerminalNode SEMICOLON() { return getToken(WinxParser.SEMICOLON, 0); }
-		public CommentContext comment() {
-			return getRuleContext(CommentContext.class,0);
-		}
 		public Specification_entryContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1293,29 +1154,18 @@ public class WinxParser extends Parser {
 	public final Specification_entryContext specification_entry() throws RecognitionException {
 		Specification_entryContext _localctx = new Specification_entryContext(_ctx, getState());
 		enterRule(_localctx, 28, RULE_specification_entry);
-		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(190);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==COMMENT) {
-				{
-				setState(189);
-				comment();
-				}
-			}
-
-			setState(192);
+			setState(166);
 			match(T__4);
-			setState(193);
+			setState(167);
 			match(ID);
-			setState(194);
+			setState(168);
 			match(COLON);
-			setState(195);
+			setState(169);
 			match(STRING);
-			setState(196);
+			setState(170);
 			match(SEMICOLON);
 			}
 		}
@@ -1362,19 +1212,19 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(198);
+			setState(172);
 			type();
-			setState(200);
+			setState(174);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__9) {
+			if (_la==T__7) {
 				{
-				setState(199);
-				match(T__9);
+				setState(173);
+				match(T__7);
 				}
 			}
 
-			setState(202);
+			setState(176);
 			match(ID);
 			}
 		}
@@ -1417,9 +1267,9 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(204);
+			setState(178);
 			_la = _input.LA(1);
-			if ( !(_la==T__10 || _la==T__11) ) {
+			if ( !(_la==T__8 || _la==T__9) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1469,9 +1319,9 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(206);
+			setState(180);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 34594816L) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 134477824L) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1520,9 +1370,9 @@ public class WinxParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(208);
+			setState(182);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 15728640L) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 3932160L) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1544,35 +1394,43 @@ public class WinxParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class CommentContext extends ParserRuleContext {
-		public TerminalNode COMMENT() { return getToken(WinxParser.COMMENT, 0); }
-		public CommentContext(ParserRuleContext parent, int invokingState) {
+	public static class Logical_opContext extends ParserRuleContext {
+		public Logical_opContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_comment; }
+		@Override public int getRuleIndex() { return RULE_logical_op; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterComment(this);
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).enterLogical_op(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitComment(this);
+			if ( listener instanceof WinxListener ) ((WinxListener)listener).exitLogical_op(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitComment(this);
+			if ( visitor instanceof WinxVisitor ) return ((WinxVisitor<? extends T>)visitor).visitLogical_op(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final CommentContext comment() throws RecognitionException {
-		CommentContext _localctx = new CommentContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_comment);
+	public final Logical_opContext logical_op() throws RecognitionException {
+		Logical_opContext _localctx = new Logical_opContext(_ctx, getState());
+		enterRule(_localctx, 38, RULE_logical_op);
+		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(210);
-			match(COMMENT);
+			setState(184);
+			_la = _input.LA(1);
+			if ( !(_la==T__21 || _la==T__22) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -1587,135 +1445,113 @@ public class WinxParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\u0004\u0001\'\u00d5\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
+		"\u0004\u0001\'\u00bb\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
 		"\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+
 		"\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+
 		"\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002"+
 		"\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002\u000f\u0007\u000f"+
 		"\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007\u0012"+
-		"\u0002\u0013\u0007\u0013\u0001\u0000\u0001\u0000\u0004\u0000+\b\u0000"+
-		"\u000b\u0000\f\u0000,\u0001\u0001\u0001\u0001\u0001\u0001\u0004\u0001"+
-		"2\b\u0001\u000b\u0001\f\u00013\u0001\u0002\u0001\u0002\u0001\u0002\u0001"+
-		"\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0003\u0003=\b\u0003\u0001"+
-		"\u0003\u0003\u0003@\b\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001"+
-		"\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0003\u0004L\b\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0001\u0005\u0001\u0005\u0004\u0005T\b\u0005\u000b\u0005\f\u0005"+
-		"U\u0001\u0006\u0003\u0006Y\b\u0006\u0001\u0006\u0003\u0006\\\b\u0006\u0001"+
-		"\u0006\u0001\u0006\u0001\u0006\u0005\u0006a\b\u0006\n\u0006\f\u0006d\t"+
-		"\u0006\u0001\u0006\u0005\u0006g\b\u0006\n\u0006\f\u0006j\t\u0006\u0001"+
-		"\u0006\u0001\u0006\u0001\u0007\u0003\u0007o\b\u0007\u0001\u0007\u0003"+
-		"\u0007r\b\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001"+
-		"\u0007\u0005\u0007y\b\u0007\n\u0007\f\u0007|\t\u0007\u0001\u0007\u0001"+
-		"\u0007\u0001\b\u0003\b\u0081\b\b\u0001\b\u0001\b\u0003\b\u0085\b\b\u0001"+
-		"\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0003\n\u008d\b\n\u0001\n\u0003"+
-		"\n\u0090\b\n\u0001\n\u0003\n\u0093\b\n\u0001\n\u0001\n\u0001\n\u0003\n"+
-		"\u0098\b\n\u0001\n\u0001\n\u0001\n\u0003\n\u009d\b\n\u0001\n\u0001\n\u0001"+
-		"\u000b\u0001\u000b\u0005\u000b\u00a3\b\u000b\n\u000b\f\u000b\u00a6\t\u000b"+
-		"\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0005\f\u00ae"+
-		"\b\f\n\f\f\f\u00b1\t\f\u0001\r\u0001\r\u0001\r\u0001\r\u0005\r\u00b7\b"+
-		"\r\n\r\f\r\u00ba\t\r\u0001\r\u0001\r\u0001\u000e\u0003\u000e\u00bf\b\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000f\u0001\u000f\u0003\u000f\u00c9\b\u000f\u0001\u000f\u0001\u000f"+
-		"\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012"+
-		"\u0001\u0013\u0001\u0013\u0001\u0013\u0000\u0000\u0014\u0000\u0002\u0004"+
-		"\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \""+
-		"$&\u0000\u0004\u0001\u0000\u0007\b\u0001\u0000\u000b\f\u0002\u0000\r\u0013"+
-		"\u0019\u0019\u0001\u0000\u0014\u0017\u00dd\u0000*\u0001\u0000\u0000\u0000"+
-		"\u00021\u0001\u0000\u0000\u0000\u00045\u0001\u0000\u0000\u0000\u0006<"+
-		"\u0001\u0000\u0000\u0000\bG\u0001\u0000\u0000\u0000\nS\u0001\u0000\u0000"+
-		"\u0000\fX\u0001\u0000\u0000\u0000\u000en\u0001\u0000\u0000\u0000\u0010"+
-		"\u0080\u0001\u0000\u0000\u0000\u0012\u0089\u0001\u0000\u0000\u0000\u0014"+
-		"\u008c\u0001\u0000\u0000\u0000\u0016\u00a0\u0001\u0000\u0000\u0000\u0018"+
-		"\u00aa\u0001\u0000\u0000\u0000\u001a\u00b2\u0001\u0000\u0000\u0000\u001c"+
-		"\u00be\u0001\u0000\u0000\u0000\u001e\u00c6\u0001\u0000\u0000\u0000 \u00cc"+
-		"\u0001\u0000\u0000\u0000\"\u00ce\u0001\u0000\u0000\u0000$\u00d0\u0001"+
-		"\u0000\u0000\u0000&\u00d2\u0001\u0000\u0000\u0000(+\u0003\u0004\u0002"+
-		"\u0000)+\u0005\u001b\u0000\u0000*(\u0001\u0000\u0000\u0000*)\u0001\u0000"+
-		"\u0000\u0000+,\u0001\u0000\u0000\u0000,*\u0001\u0000\u0000\u0000,-\u0001"+
-		"\u0000\u0000\u0000-\u0001\u0001\u0000\u0000\u0000.2\u0003\u0006\u0003"+
-		"\u0000/2\u0003\b\u0004\u000002\u0005\u001b\u0000\u00001.\u0001\u0000\u0000"+
-		"\u00001/\u0001\u0000\u0000\u000010\u0001\u0000\u0000\u000023\u0001\u0000"+
-		"\u0000\u000031\u0001\u0000\u0000\u000034\u0001\u0000\u0000\u00004\u0003"+
-		"\u0001\u0000\u0000\u000056\u0005\u0001\u0000\u000067\u0005\u0018\u0000"+
-		"\u000078\u0005$\u0000\u000089\u0003\u0002\u0001\u00009:\u0005%\u0000\u0000"+
-		":\u0005\u0001\u0000\u0000\u0000;=\u0003 \u0010\u0000<;\u0001\u0000\u0000"+
-		"\u0000<=\u0001\u0000\u0000\u0000=?\u0001\u0000\u0000\u0000>@\u0003$\u0012"+
-		"\u0000?>\u0001\u0000\u0000\u0000?@\u0001\u0000\u0000\u0000@A\u0001\u0000"+
-		"\u0000\u0000AB\u0005\u0002\u0000\u0000BC\u0005\u0018\u0000\u0000CD\u0005"+
-		"$\u0000\u0000DE\u0003\n\u0005\u0000EF\u0005%\u0000\u0000F\u0007\u0001"+
-		"\u0000\u0000\u0000GH\u0005\u0003\u0000\u0000HK\u0005\u0018\u0000\u0000"+
-		"IJ\u0005\u0004\u0000\u0000JL\u0005\u0018\u0000\u0000KI\u0001\u0000\u0000"+
-		"\u0000KL\u0001\u0000\u0000\u0000LM\u0001\u0000\u0000\u0000MN\u0005$\u0000"+
-		"\u0000NO\u0003\n\u0005\u0000OP\u0005%\u0000\u0000P\t\u0001\u0000\u0000"+
-		"\u0000QT\u0003\f\u0006\u0000RT\u0003\u0014\n\u0000SQ\u0001\u0000\u0000"+
-		"\u0000SR\u0001\u0000\u0000\u0000TU\u0001\u0000\u0000\u0000US\u0001\u0000"+
-		"\u0000\u0000UV\u0001\u0000\u0000\u0000V\u000b\u0001\u0000\u0000\u0000"+
-		"WY\u0003&\u0013\u0000XW\u0001\u0000\u0000\u0000XY\u0001\u0000\u0000\u0000"+
-		"Y[\u0001\u0000\u0000\u0000Z\\\u0003 \u0010\u0000[Z\u0001\u0000\u0000\u0000"+
-		"[\\\u0001\u0000\u0000\u0000\\]\u0001\u0000\u0000\u0000]^\u0005\u0018\u0000"+
-		"\u0000^b\u0005$\u0000\u0000_a\u0003\u000e\u0007\u0000`_\u0001\u0000\u0000"+
-		"\u0000ad\u0001\u0000\u0000\u0000b`\u0001\u0000\u0000\u0000bc\u0001\u0000"+
-		"\u0000\u0000ch\u0001\u0000\u0000\u0000db\u0001\u0000\u0000\u0000eg\u0003"+
-		"\u0010\b\u0000fe\u0001\u0000\u0000\u0000gj\u0001\u0000\u0000\u0000hf\u0001"+
-		"\u0000\u0000\u0000hi\u0001\u0000\u0000\u0000ik\u0001\u0000\u0000\u0000"+
-		"jh\u0001\u0000\u0000\u0000kl\u0005%\u0000\u0000l\r\u0001\u0000\u0000\u0000"+
-		"mo\u0003&\u0013\u0000nm\u0001\u0000\u0000\u0000no\u0001\u0000\u0000\u0000"+
-		"oq\u0001\u0000\u0000\u0000pr\u0003 \u0010\u0000qp\u0001\u0000\u0000\u0000"+
-		"qr\u0001\u0000\u0000\u0000rs\u0001\u0000\u0000\u0000st\u0005\u0005\u0000"+
-		"\u0000tz\u0005\u0018\u0000\u0000uv\u0003\u0012\t\u0000vw\u0005\u0018\u0000"+
-		"\u0000wy\u0001\u0000\u0000\u0000xu\u0001\u0000\u0000\u0000y|\u0001\u0000"+
-		"\u0000\u0000zx\u0001\u0000\u0000\u0000z{\u0001\u0000\u0000\u0000{}\u0001"+
-		"\u0000\u0000\u0000|z\u0001\u0000\u0000\u0000}~\u0005\"\u0000\u0000~\u000f"+
-		"\u0001\u0000\u0000\u0000\u007f\u0081\u0003&\u0013\u0000\u0080\u007f\u0001"+
-		"\u0000\u0000\u0000\u0080\u0081\u0001\u0000\u0000\u0000\u0081\u0082\u0001"+
-		"\u0000\u0000\u0000\u0082\u0084\u0005\u0006\u0000\u0000\u0083\u0085\u0003"+
-		" \u0010\u0000\u0084\u0083\u0001\u0000\u0000\u0000\u0084\u0085\u0001\u0000"+
-		"\u0000\u0000\u0085\u0086\u0001\u0000\u0000\u0000\u0086\u0087\u0005\u0018"+
-		"\u0000\u0000\u0087\u0088\u0005\"\u0000\u0000\u0088\u0011\u0001\u0000\u0000"+
-		"\u0000\u0089\u008a\u0007\u0000\u0000\u0000\u008a\u0013\u0001\u0000\u0000"+
-		"\u0000\u008b\u008d\u0003&\u0013\u0000\u008c\u008b\u0001\u0000\u0000\u0000"+
-		"\u008c\u008d\u0001\u0000\u0000\u0000\u008d\u008f\u0001\u0000\u0000\u0000"+
-		"\u008e\u0090\u0003 \u0010\u0000\u008f\u008e\u0001\u0000\u0000\u0000\u008f"+
-		"\u0090\u0001\u0000\u0000\u0000\u0090\u0092\u0001\u0000\u0000\u0000\u0091"+
-		"\u0093\u0003$\u0012\u0000\u0092\u0091\u0001\u0000\u0000\u0000\u0092\u0093"+
-		"\u0001\u0000\u0000\u0000\u0093\u0094\u0001\u0000\u0000\u0000\u0094\u0095"+
-		"\u0005\u0018\u0000\u0000\u0095\u0097\u0005\u001f\u0000\u0000\u0096\u0098"+
-		"\u0003\u0018\f\u0000\u0097\u0096\u0001\u0000\u0000\u0000\u0097\u0098\u0001"+
-		"\u0000\u0000\u0000\u0098\u0099\u0001\u0000\u0000\u0000\u0099\u009c\u0005"+
-		" \u0000\u0000\u009a\u009b\u0005\u0004\u0000\u0000\u009b\u009d\u0005\u0018"+
-		"\u0000\u0000\u009c\u009a\u0001\u0000\u0000\u0000\u009c\u009d\u0001\u0000"+
-		"\u0000\u0000\u009d\u009e\u0001\u0000\u0000\u0000\u009e\u009f\u0003\u0016"+
-		"\u000b\u0000\u009f\u0015\u0001\u0000\u0000\u0000\u00a0\u00a4\u0005$\u0000"+
-		"\u0000\u00a1\u00a3\u0003\u001c\u000e\u0000\u00a2\u00a1\u0001\u0000\u0000"+
-		"\u0000\u00a3\u00a6\u0001\u0000\u0000\u0000\u00a4\u00a2\u0001\u0000\u0000"+
-		"\u0000\u00a4\u00a5\u0001\u0000\u0000\u0000\u00a5\u00a7\u0001\u0000\u0000"+
-		"\u0000\u00a6\u00a4\u0001\u0000\u0000\u0000\u00a7\u00a8\u0003\u001a\r\u0000"+
-		"\u00a8\u00a9\u0005%\u0000\u0000\u00a9\u0017\u0001\u0000\u0000\u0000\u00aa"+
-		"\u00af\u0003\u001e\u000f\u0000\u00ab\u00ac\u0005#\u0000\u0000\u00ac\u00ae"+
-		"\u0003\u001e\u000f\u0000\u00ad\u00ab\u0001\u0000\u0000\u0000\u00ae\u00b1"+
-		"\u0001\u0000\u0000\u0000\u00af\u00ad\u0001\u0000\u0000\u0000\u00af\u00b0"+
-		"\u0001\u0000\u0000\u0000\u00b0\u0019\u0001\u0000\u0000\u0000\u00b1\u00af"+
-		"\u0001\u0000\u0000\u0000\u00b2\u00b3\u0005\t\u0000\u0000\u00b3\u00b8\u0003"+
-		"\u001e\u000f\u0000\u00b4\u00b5\u0005#\u0000\u0000\u00b5\u00b7\u0003\u001e"+
-		"\u000f\u0000\u00b6\u00b4\u0001\u0000\u0000\u0000\u00b7\u00ba\u0001\u0000"+
-		"\u0000\u0000\u00b8\u00b6\u0001\u0000\u0000\u0000\u00b8\u00b9\u0001\u0000"+
-		"\u0000\u0000\u00b9\u00bb\u0001\u0000\u0000\u0000\u00ba\u00b8\u0001\u0000"+
-		"\u0000\u0000\u00bb\u00bc\u0005\"\u0000\u0000\u00bc\u001b\u0001\u0000\u0000"+
-		"\u0000\u00bd\u00bf\u0003&\u0013\u0000\u00be\u00bd\u0001\u0000\u0000\u0000"+
-		"\u00be\u00bf\u0001\u0000\u0000\u0000\u00bf\u00c0\u0001\u0000\u0000\u0000"+
-		"\u00c0\u00c1\u0005\u0005\u0000\u0000\u00c1\u00c2\u0005\u0018\u0000\u0000"+
-		"\u00c2\u00c3\u0005!\u0000\u0000\u00c3\u00c4\u0005\u0019\u0000\u0000\u00c4"+
-		"\u00c5\u0005\"\u0000\u0000\u00c5\u001d\u0001\u0000\u0000\u0000\u00c6\u00c8"+
-		"\u0003\"\u0011\u0000\u00c7\u00c9\u0005\n\u0000\u0000\u00c8\u00c7\u0001"+
-		"\u0000\u0000\u0000\u00c8\u00c9\u0001\u0000\u0000\u0000\u00c9\u00ca\u0001"+
-		"\u0000\u0000\u0000\u00ca\u00cb\u0005\u0018\u0000\u0000\u00cb\u001f\u0001"+
-		"\u0000\u0000\u0000\u00cc\u00cd\u0007\u0001\u0000\u0000\u00cd!\u0001\u0000"+
-		"\u0000\u0000\u00ce\u00cf\u0007\u0002\u0000\u0000\u00cf#\u0001\u0000\u0000"+
-		"\u0000\u00d0\u00d1\u0007\u0003\u0000\u0000\u00d1%\u0001\u0000\u0000\u0000"+
-		"\u00d2\u00d3\u0005\u001b\u0000\u0000\u00d3\'\u0001\u0000\u0000\u0000\u001c"+
-		"*,13<?KSUX[bhnqz\u0080\u0084\u008c\u008f\u0092\u0097\u009c\u00a4\u00af"+
-		"\u00b8\u00be\u00c8";
+		"\u0002\u0013\u0007\u0013\u0001\u0000\u0004\u0000*\b\u0000\u000b\u0000"+
+		"\f\u0000+\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+
+		"\u0001\u0001\u0001\u0002\u0001\u0002\u0005\u00026\b\u0002\n\u0002\f\u0002"+
+		"9\t\u0002\u0001\u0003\u0003\u0003<\b\u0003\u0001\u0003\u0001\u0003\u0001"+
+		"\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001"+
+		"\u0004\u0003\u0004G\b\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+
+		"\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0005"+
+		"\u0006R\b\u0006\n\u0006\f\u0006U\t\u0006\u0001\u0007\u0003\u0007X\b\u0007"+
+		"\u0001\u0007\u0001\u0007\u0001\u0007\u0005\u0007]\b\u0007\n\u0007\f\u0007"+
+		"`\t\u0007\u0001\u0007\u0005\u0007c\b\u0007\n\u0007\f\u0007f\t\u0007\u0001"+
+		"\u0007\u0001\u0007\u0001\b\u0003\bk\b\b\u0001\b\u0001\b\u0001\b\u0001"+
+		"\b\u0001\b\u0005\br\b\b\n\b\f\bu\t\b\u0001\b\u0001\b\u0001\t\u0001\t\u0003"+
+		"\t{\b\t\u0001\t\u0001\t\u0001\t\u0001\n\u0003\n\u0081\b\n\u0001\n\u0003"+
+		"\n\u0084\b\n\u0001\n\u0001\n\u0001\n\u0003\n\u0089\b\n\u0001\n\u0001\n"+
+		"\u0003\n\u008d\b\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0005\u000b"+
+		"\u0093\b\u000b\n\u000b\f\u000b\u0096\t\u000b\u0001\u000b\u0001\u000b\u0001"+
+		"\u000b\u0001\f\u0001\f\u0001\f\u0005\f\u009e\b\f\n\f\f\f\u00a1\t\f\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
+		"\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0003\u000f\u00af\b\u000f"+
+		"\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011"+
+		"\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0000\u0000"+
+		"\u0014\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018"+
+		"\u001a\u001c\u001e \"$&\u0000\u0004\u0001\u0000\t\n\u0002\u0000\u000b"+
+		"\u0011\u001b\u001b\u0001\u0000\u0012\u0015\u0001\u0000\u0016\u0017\u00ba"+
+		"\u0000)\u0001\u0000\u0000\u0000\u0002-\u0001\u0000\u0000\u0000\u00047"+
+		"\u0001\u0000\u0000\u0000\u0006;\u0001\u0000\u0000\u0000\bC\u0001\u0000"+
+		"\u0000\u0000\nL\u0001\u0000\u0000\u0000\fS\u0001\u0000\u0000\u0000\u000e"+
+		"W\u0001\u0000\u0000\u0000\u0010j\u0001\u0000\u0000\u0000\u0012x\u0001"+
+		"\u0000\u0000\u0000\u0014\u0080\u0001\u0000\u0000\u0000\u0016\u0090\u0001"+
+		"\u0000\u0000\u0000\u0018\u009a\u0001\u0000\u0000\u0000\u001a\u00a2\u0001"+
+		"\u0000\u0000\u0000\u001c\u00a6\u0001\u0000\u0000\u0000\u001e\u00ac\u0001"+
+		"\u0000\u0000\u0000 \u00b2\u0001\u0000\u0000\u0000\"\u00b4\u0001\u0000"+
+		"\u0000\u0000$\u00b6\u0001\u0000\u0000\u0000&\u00b8\u0001\u0000\u0000\u0000"+
+		"(*\u0003\u0002\u0001\u0000)(\u0001\u0000\u0000\u0000*+\u0001\u0000\u0000"+
+		"\u0000+)\u0001\u0000\u0000\u0000+,\u0001\u0000\u0000\u0000,\u0001\u0001"+
+		"\u0000\u0000\u0000-.\u0005\u0001\u0000\u0000./\u0005\u0018\u0000\u0000"+
+		"/0\u0005$\u0000\u000001\u0003\u0004\u0002\u000012\u0005%\u0000\u00002"+
+		"\u0003\u0001\u0000\u0000\u000036\u0003\u0006\u0003\u000046\u0003\b\u0004"+
+		"\u000053\u0001\u0000\u0000\u000054\u0001\u0000\u0000\u000069\u0001\u0000"+
+		"\u0000\u000075\u0001\u0000\u0000\u000078\u0001\u0000\u0000\u00008\u0005"+
+		"\u0001\u0000\u0000\u000097\u0001\u0000\u0000\u0000:<\u0003 \u0010\u0000"+
+		";:\u0001\u0000\u0000\u0000;<\u0001\u0000\u0000\u0000<=\u0001\u0000\u0000"+
+		"\u0000=>\u0005\u0002\u0000\u0000>?\u0005\u0018\u0000\u0000?@\u0005$\u0000"+
+		"\u0000@A\u0003\f\u0006\u0000AB\u0005%\u0000\u0000B\u0007\u0001\u0000\u0000"+
+		"\u0000CD\u0005\u0003\u0000\u0000DF\u0005\u0018\u0000\u0000EG\u0003\n\u0005"+
+		"\u0000FE\u0001\u0000\u0000\u0000FG\u0001\u0000\u0000\u0000GH\u0001\u0000"+
+		"\u0000\u0000HI\u0005$\u0000\u0000IJ\u0003\f\u0006\u0000JK\u0005%\u0000"+
+		"\u0000K\t\u0001\u0000\u0000\u0000LM\u0005\u0004\u0000\u0000MN\u0005\u0018"+
+		"\u0000\u0000N\u000b\u0001\u0000\u0000\u0000OR\u0003\u000e\u0007\u0000"+
+		"PR\u0003\u0014\n\u0000QO\u0001\u0000\u0000\u0000QP\u0001\u0000\u0000\u0000"+
+		"RU\u0001\u0000\u0000\u0000SQ\u0001\u0000\u0000\u0000ST\u0001\u0000\u0000"+
+		"\u0000T\r\u0001\u0000\u0000\u0000US\u0001\u0000\u0000\u0000VX\u0003 \u0010"+
+		"\u0000WV\u0001\u0000\u0000\u0000WX\u0001\u0000\u0000\u0000XY\u0001\u0000"+
+		"\u0000\u0000YZ\u0005\u0018\u0000\u0000Z^\u0005$\u0000\u0000[]\u0003\u0010"+
+		"\b\u0000\\[\u0001\u0000\u0000\u0000]`\u0001\u0000\u0000\u0000^\\\u0001"+
+		"\u0000\u0000\u0000^_\u0001\u0000\u0000\u0000_d\u0001\u0000\u0000\u0000"+
+		"`^\u0001\u0000\u0000\u0000ac\u0003\u0012\t\u0000ba\u0001\u0000\u0000\u0000"+
+		"cf\u0001\u0000\u0000\u0000db\u0001\u0000\u0000\u0000de\u0001\u0000\u0000"+
+		"\u0000eg\u0001\u0000\u0000\u0000fd\u0001\u0000\u0000\u0000gh\u0005%\u0000"+
+		"\u0000h\u000f\u0001\u0000\u0000\u0000ik\u0003 \u0010\u0000ji\u0001\u0000"+
+		"\u0000\u0000jk\u0001\u0000\u0000\u0000kl\u0001\u0000\u0000\u0000lm\u0005"+
+		"\u0005\u0000\u0000ms\u0005\u0018\u0000\u0000no\u0003&\u0013\u0000op\u0005"+
+		"\u0018\u0000\u0000pr\u0001\u0000\u0000\u0000qn\u0001\u0000\u0000\u0000"+
+		"ru\u0001\u0000\u0000\u0000sq\u0001\u0000\u0000\u0000st\u0001\u0000\u0000"+
+		"\u0000tv\u0001\u0000\u0000\u0000us\u0001\u0000\u0000\u0000vw\u0005\"\u0000"+
+		"\u0000w\u0011\u0001\u0000\u0000\u0000xz\u0005\u0006\u0000\u0000y{\u0003"+
+		" \u0010\u0000zy\u0001\u0000\u0000\u0000z{\u0001\u0000\u0000\u0000{|\u0001"+
+		"\u0000\u0000\u0000|}\u0005\u0018\u0000\u0000}~\u0005\"\u0000\u0000~\u0013"+
+		"\u0001\u0000\u0000\u0000\u007f\u0081\u0003 \u0010\u0000\u0080\u007f\u0001"+
+		"\u0000\u0000\u0000\u0080\u0081\u0001\u0000\u0000\u0000\u0081\u0083\u0001"+
+		"\u0000\u0000\u0000\u0082\u0084\u0003$\u0012\u0000\u0083\u0082\u0001\u0000"+
+		"\u0000\u0000\u0083\u0084\u0001\u0000\u0000\u0000\u0084\u0085\u0001\u0000"+
+		"\u0000\u0000\u0085\u0086\u0005\u0018\u0000\u0000\u0086\u0088\u0005\u001f"+
+		"\u0000\u0000\u0087\u0089\u0003\u0018\f\u0000\u0088\u0087\u0001\u0000\u0000"+
+		"\u0000\u0088\u0089\u0001\u0000\u0000\u0000\u0089\u008a\u0001\u0000\u0000"+
+		"\u0000\u008a\u008c\u0005 \u0000\u0000\u008b\u008d\u0003\n\u0005\u0000"+
+		"\u008c\u008b\u0001\u0000\u0000\u0000\u008c\u008d\u0001\u0000\u0000\u0000"+
+		"\u008d\u008e\u0001\u0000\u0000\u0000\u008e\u008f\u0003\u0016\u000b\u0000"+
+		"\u008f\u0015\u0001\u0000\u0000\u0000\u0090\u0094\u0005$\u0000\u0000\u0091"+
+		"\u0093\u0003\u001c\u000e\u0000\u0092\u0091\u0001\u0000\u0000\u0000\u0093"+
+		"\u0096\u0001\u0000\u0000\u0000\u0094\u0092\u0001\u0000\u0000\u0000\u0094"+
+		"\u0095\u0001\u0000\u0000\u0000\u0095\u0097\u0001\u0000\u0000\u0000\u0096"+
+		"\u0094\u0001\u0000\u0000\u0000\u0097\u0098\u0003\u001a\r\u0000\u0098\u0099"+
+		"\u0005%\u0000\u0000\u0099\u0017\u0001\u0000\u0000\u0000\u009a\u009f\u0003"+
+		"\u001e\u000f\u0000\u009b\u009c\u0005#\u0000\u0000\u009c\u009e\u0003\u001e"+
+		"\u000f\u0000\u009d\u009b\u0001\u0000\u0000\u0000\u009e\u00a1\u0001\u0000"+
+		"\u0000\u0000\u009f\u009d\u0001\u0000\u0000\u0000\u009f\u00a0\u0001\u0000"+
+		"\u0000\u0000\u00a0\u0019\u0001\u0000\u0000\u0000\u00a1\u009f\u0001\u0000"+
+		"\u0000\u0000\u00a2\u00a3\u0005\u0007\u0000\u0000\u00a3\u00a4\u0003\u001e"+
+		"\u000f\u0000\u00a4\u00a5\u0005\"\u0000\u0000\u00a5\u001b\u0001\u0000\u0000"+
+		"\u0000\u00a6\u00a7\u0005\u0005\u0000\u0000\u00a7\u00a8\u0005\u0018\u0000"+
+		"\u0000\u00a8\u00a9\u0005!\u0000\u0000\u00a9\u00aa\u0005\u001b\u0000\u0000"+
+		"\u00aa\u00ab\u0005\"\u0000\u0000\u00ab\u001d\u0001\u0000\u0000\u0000\u00ac"+
+		"\u00ae\u0003\"\u0011\u0000\u00ad\u00af\u0005\b\u0000\u0000\u00ae\u00ad"+
+		"\u0001\u0000\u0000\u0000\u00ae\u00af\u0001\u0000\u0000\u0000\u00af\u00b0"+
+		"\u0001\u0000\u0000\u0000\u00b0\u00b1\u0005\u0018\u0000\u0000\u00b1\u001f"+
+		"\u0001\u0000\u0000\u0000\u00b2\u00b3\u0007\u0000\u0000\u0000\u00b3!\u0001"+
+		"\u0000\u0000\u0000\u00b4\u00b5\u0007\u0001\u0000\u0000\u00b5#\u0001\u0000"+
+		"\u0000\u0000\u00b6\u00b7\u0007\u0002\u0000\u0000\u00b7%\u0001\u0000\u0000"+
+		"\u0000\u00b8\u00b9\u0007\u0003\u0000\u0000\u00b9\'\u0001\u0000\u0000\u0000"+
+		"\u0014+57;FQSW^djsz\u0080\u0083\u0088\u008c\u0094\u009f\u00ae";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/org/lumijiez/parser/WinxVisitor.java b/src/main/java/org/lumijiez/parser/WinxVisitor.java
index 7d552d0..ff28fcc 100644
--- a/src/main/java/org/lumijiez/parser/WinxVisitor.java
+++ b/src/main/java/org/lumijiez/parser/WinxVisitor.java
@@ -16,18 +16,18 @@ public interface WinxVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitWinx(WinxParser.WinxContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link WinxParser#body}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitBody(WinxParser.BodyContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WinxParser#package}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
 	T visitPackage(WinxParser.PackageContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link WinxParser#body}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitBody(WinxParser.BodyContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WinxParser#interface}.
 	 * @param ctx the parse tree
@@ -40,6 +40,12 @@ public interface WinxVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitSpecification(WinxParser.SpecificationContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link WinxParser#impls}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitImpls(WinxParser.ImplsContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WinxParser#spec_body}.
 	 * @param ctx the parse tree
@@ -64,12 +70,6 @@ public interface WinxVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitResult_specification(WinxParser.Result_specificationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link WinxParser#logical_op}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitLogical_op(WinxParser.Logical_opContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WinxParser#function_spec}.
 	 * @param ctx the parse tree
@@ -89,11 +89,11 @@ public interface WinxVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitInput_types(WinxParser.Input_typesContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link WinxParser#return_types}.
+	 * Visit a parse tree produced by {@link WinxParser#return_type}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitReturn_types(WinxParser.Return_typesContext ctx);
+	T visitReturn_type(WinxParser.Return_typeContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WinxParser#specification_entry}.
 	 * @param ctx the parse tree
@@ -125,9 +125,9 @@ public interface WinxVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitAccess_modifiers(WinxParser.Access_modifiersContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link WinxParser#comment}.
+	 * Visit a parse tree produced by {@link WinxParser#logical_op}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitComment(WinxParser.CommentContext ctx);
+	T visitLogical_op(WinxParser.Logical_opContext ctx);
 }
\ No newline at end of file