From e3c436ff30460a78f787b04bcaf2225afae9a10a Mon Sep 17 00:00:00 2001
From: Daniel <danthevip@gmail.com>
Date: Wed, 6 Mar 2024 00:09:11 +0200
Subject: [PATCH] More operations

---
 src/grammars/SoftwareRequirements.g4          |   73 +-
 .../parser/SoftwareRequirements.interp        |   38 +-
 .../parser/SoftwareRequirements.tokens        |   90 +-
 .../SoftwareRequirementsBaseListener.java     |   68 +-
 .../SoftwareRequirementsBaseVisitor.java      |   38 +-
 .../parser/SoftwareRequirementsLexer.interp   |   28 +-
 .../parser/SoftwareRequirementsLexer.java     |  329 ++---
 .../parser/SoftwareRequirementsLexer.tokens   |   90 +-
 .../parser/SoftwareRequirementsListener.java  |   80 +-
 .../parser/SoftwareRequirementsParser.java    | 1085 +++++++++++------
 .../parser/SoftwareRequirementsVisitor.java   |   44 +-
 src/main/resources/TestProgram.txt            |   29 +-
 12 files changed, 1303 insertions(+), 689 deletions(-)

diff --git a/src/grammars/SoftwareRequirements.g4 b/src/grammars/SoftwareRequirements.g4
index 3777422..e0346de 100644
--- a/src/grammars/SoftwareRequirements.g4
+++ b/src/grammars/SoftwareRequirements.g4
@@ -9,13 +9,26 @@ INT         : [0-9]+ ;
 FLOAT       : [0-9]+ '.' [0-9]* | '.' [0-9]+ ;
 
 // Puturos rules
-program         : (requirementSpec | functionSpec)+ ;
 
-requirementSpec : EXCLAM? ID
-                  (':' description)?
-                  predicate ';' ;
+program         : description?
+                  'package' ID
+                  '{'
+                  program_body
+                  '}'
+                  ;
 
-description     : DESCRIPTION;
+program_body    : (requirementSpec | functionSpec)+ ;
+
+requirementSpec : description?
+                  importance?
+                   ID '{'
+                  req_specification*
+                  result_specification*
+                  '}' ;
+
+req_specification : importance? '@' ID (logical_op ID)* ';';
+
+result_specification : 'result' importance? ID ';';
 
 predicate       : expression '=>' expression ;
 
@@ -26,28 +39,38 @@ term            : '{' expression '}'
 
 logical_op      : '&&' | '||' ;
 
-functionSpec    : EXCLAM?
-                ID'()' ':'
-                description?
-                access_modifier?
+
+
+// Function Specification
+
+functionSpec    : description?
+                importance?
+                access_modifiers?
+                ID'(' input_types? ')'
+                functionBody
+                ;
+
+functionBody    : '{'
+                specification*
                 return_types
-                '{' parameter_list '}' ';'
+                '}'
                 ;
 
-access_modifier : 'Access ' access_modifiers ';';
+input_types     : variable (',' variable)*;
 
-return_types    : 'Return' '(' return (',' return)* ')' ';' ;
+return_types    : 'return' variable (',' variable)* ';' ;
 
-return          : type ID;
-
-parameter_list  : parameter (',' parameter)* ;
-
-parameter       : STRING ':'
-                (STRING
-                | INT
-                | FLOAT)
+specification   : '@' ID ':'
+                STRING
+                ';'
                 ;
 
+// General Rules
+
+variable        : type '[]'? ID;
+
+importance      : 'critical' | 'optional' ;
+
 type            : 'INT'
                 | 'FLOAT'
                 | 'DOUBLE'
@@ -57,12 +80,14 @@ type            : 'INT'
                 | 'VOID'
                 ;
 
-access_modifiers : 'PUBLIC'
-                 | 'PROTECTED'
-                 | 'PRIVATE'
-                 | 'DEFAULT'
+access_modifiers : 'public'
+                 | 'protected'
+                 | 'private'
+                 | 'default'
                  ;
 
+description     : DESCRIPTION;
+
 // Symballs
 LPAREN          : '(' ;
 RPAREN          : ')' ;
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirements.interp b/src/main/java/org/lumijiez/parser/SoftwareRequirements.interp
index 09dbe80..1ce711a 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirements.interp
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirements.interp
@@ -1,11 +1,15 @@
 token literal names:
 null
+'package'
+'@'
+'result'
 '=>'
 '&&'
 '||'
-'()'
-'Access '
-'Return'
+'return'
+'[]'
+'critical'
+'optional'
 'INT'
 'FLOAT'
 'DOUBLE'
@@ -13,10 +17,10 @@ null
 'BOOLEAN'
 'CHAR'
 'VOID'
-'PUBLIC'
-'PROTECTED'
-'PRIVATE'
-'DEFAULT'
+'public'
+'protected'
+'private'
+'default'
 null
 null
 null
@@ -52,6 +56,10 @@ null
 null
 null
 null
+null
+null
+null
+null
 ID
 STRING
 DESCRIPTION
@@ -70,21 +78,25 @@ EXCLAM
 
 rule names:
 program
+program_body
 requirementSpec
-description
+req_specification
+result_specification
 predicate
 expression
 term
 logical_op
 functionSpec
-access_modifier
+functionBody
+input_types
 return_types
-return
-parameter_list
-parameter
+specification
+variable
+importance
 type
 access_modifiers
+description
 
 
 atn:
-[4, 1, 32, 126, 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, 1, 0, 1, 0, 4, 0, 33, 8, 0, 11, 0, 12, 0, 34, 1, 1, 3, 1, 38, 8, 1, 1, 1, 1, 1, 1, 1, 3, 1, 43, 8, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 58, 8, 4, 10, 4, 12, 4, 61, 9, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 68, 8, 5, 1, 6, 1, 6, 1, 7, 3, 7, 73, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 79, 8, 7, 1, 7, 3, 7, 82, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 5, 9, 99, 8, 9, 10, 9, 12, 9, 102, 9, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 113, 8, 11, 10, 11, 12, 11, 116, 9, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 0, 0, 15, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 0, 4, 1, 0, 2, 3, 2, 0, 19, 19, 22, 23, 1, 0, 7, 13, 1, 0, 14, 17, 121, 0, 32, 1, 0, 0, 0, 2, 37, 1, 0, 0, 0, 4, 47, 1, 0, 0, 0, 6, 49, 1, 0, 0, 0, 8, 53, 1, 0, 0, 0, 10, 67, 1, 0, 0, 0, 12, 69, 1, 0, 0, 0, 14, 72, 1, 0, 0, 0, 16, 89, 1, 0, 0, 0, 18, 93, 1, 0, 0, 0, 20, 106, 1, 0, 0, 0, 22, 109, 1, 0, 0, 0, 24, 117, 1, 0, 0, 0, 26, 121, 1, 0, 0, 0, 28, 123, 1, 0, 0, 0, 30, 33, 3, 2, 1, 0, 31, 33, 3, 14, 7, 0, 32, 30, 1, 0, 0, 0, 32, 31, 1, 0, 0, 0, 33, 34, 1, 0, 0, 0, 34, 32, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0, 35, 1, 1, 0, 0, 0, 36, 38, 5, 32, 0, 0, 37, 36, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39, 42, 5, 18, 0, 0, 40, 41, 5, 26, 0, 0, 41, 43, 3, 4, 2, 0, 42, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 45, 3, 6, 3, 0, 45, 46, 5, 27, 0, 0, 46, 3, 1, 0, 0, 0, 47, 48, 5, 20, 0, 0, 48, 5, 1, 0, 0, 0, 49, 50, 3, 8, 4, 0, 50, 51, 5, 1, 0, 0, 51, 52, 3, 8, 4, 0, 52, 7, 1, 0, 0, 0, 53, 59, 3, 10, 5, 0, 54, 55, 3, 12, 6, 0, 55, 56, 3, 10, 5, 0, 56, 58, 1, 0, 0, 0, 57, 54, 1, 0, 0, 0, 58, 61, 1, 0, 0, 0, 59, 57, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 9, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 62, 63, 5, 29, 0, 0, 63, 64, 3, 8, 4, 0, 64, 65, 5, 30, 0, 0, 65, 68, 1, 0, 0, 0, 66, 68, 5, 19, 0, 0, 67, 62, 1, 0, 0, 0, 67, 66, 1, 0, 0, 0, 68, 11, 1, 0, 0, 0, 69, 70, 7, 0, 0, 0, 70, 13, 1, 0, 0, 0, 71, 73, 5, 32, 0, 0, 72, 71, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 74, 1, 0, 0, 0, 74, 75, 5, 18, 0, 0, 75, 76, 5, 4, 0, 0, 76, 78, 5, 26, 0, 0, 77, 79, 3, 4, 2, 0, 78, 77, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 81, 1, 0, 0, 0, 80, 82, 3, 16, 8, 0, 81, 80, 1, 0, 0, 0, 81, 82, 1, 0, 0, 0, 82, 83, 1, 0, 0, 0, 83, 84, 3, 18, 9, 0, 84, 85, 5, 29, 0, 0, 85, 86, 3, 22, 11, 0, 86, 87, 5, 30, 0, 0, 87, 88, 5, 27, 0, 0, 88, 15, 1, 0, 0, 0, 89, 90, 5, 5, 0, 0, 90, 91, 3, 28, 14, 0, 91, 92, 5, 27, 0, 0, 92, 17, 1, 0, 0, 0, 93, 94, 5, 6, 0, 0, 94, 95, 5, 24, 0, 0, 95, 100, 3, 20, 10, 0, 96, 97, 5, 28, 0, 0, 97, 99, 3, 20, 10, 0, 98, 96, 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, 25, 0, 0, 104, 105, 5, 27, 0, 0, 105, 19, 1, 0, 0, 0, 106, 107, 3, 26, 13, 0, 107, 108, 5, 18, 0, 0, 108, 21, 1, 0, 0, 0, 109, 114, 3, 24, 12, 0, 110, 111, 5, 28, 0, 0, 111, 113, 3, 24, 12, 0, 112, 110, 1, 0, 0, 0, 113, 116, 1, 0, 0, 0, 114, 112, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 23, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 117, 118, 5, 19, 0, 0, 118, 119, 5, 26, 0, 0, 119, 120, 7, 1, 0, 0, 120, 25, 1, 0, 0, 0, 121, 122, 7, 2, 0, 0, 122, 27, 1, 0, 0, 0, 123, 124, 7, 3, 0, 0, 124, 29, 1, 0, 0, 0, 11, 32, 34, 37, 42, 59, 67, 72, 78, 81, 100, 114]
\ No newline at end of file
+[4, 1, 36, 186, 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, 1, 0, 3, 0, 40, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 4, 1, 50, 8, 1, 11, 1, 12, 1, 51, 1, 2, 3, 2, 55, 8, 2, 1, 2, 3, 2, 58, 8, 2, 1, 2, 1, 2, 1, 2, 5, 2, 63, 8, 2, 10, 2, 12, 2, 66, 9, 2, 1, 2, 5, 2, 69, 8, 2, 10, 2, 12, 2, 72, 9, 2, 1, 2, 1, 2, 1, 3, 3, 3, 77, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 5, 3, 84, 8, 3, 10, 3, 12, 3, 87, 9, 3, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 93, 8, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 106, 8, 6, 10, 6, 12, 6, 109, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 116, 8, 7, 1, 8, 1, 8, 1, 9, 3, 9, 121, 8, 9, 1, 9, 3, 9, 124, 8, 9, 1, 9, 3, 9, 127, 8, 9, 1, 9, 1, 9, 1, 9, 3, 9, 132, 8, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 139, 8, 10, 10, 10, 12, 10, 142, 9, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 150, 8, 11, 10, 11, 12, 11, 153, 9, 11, 1, 12, 1, 12, 1, 12, 1, 12, 5, 12, 159, 8, 12, 10, 12, 12, 12, 162, 9, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 3, 14, 174, 8, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 0, 0, 19, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 0, 4, 1, 0, 5, 6, 1, 0, 9, 10, 1, 0, 11, 17, 1, 0, 18, 21, 186, 0, 39, 1, 0, 0, 0, 2, 49, 1, 0, 0, 0, 4, 54, 1, 0, 0, 0, 6, 76, 1, 0, 0, 0, 8, 90, 1, 0, 0, 0, 10, 97, 1, 0, 0, 0, 12, 101, 1, 0, 0, 0, 14, 115, 1, 0, 0, 0, 16, 117, 1, 0, 0, 0, 18, 120, 1, 0, 0, 0, 20, 136, 1, 0, 0, 0, 22, 146, 1, 0, 0, 0, 24, 154, 1, 0, 0, 0, 26, 165, 1, 0, 0, 0, 28, 171, 1, 0, 0, 0, 30, 177, 1, 0, 0, 0, 32, 179, 1, 0, 0, 0, 34, 181, 1, 0, 0, 0, 36, 183, 1, 0, 0, 0, 38, 40, 3, 36, 18, 0, 39, 38, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 41, 1, 0, 0, 0, 41, 42, 5, 1, 0, 0, 42, 43, 5, 22, 0, 0, 43, 44, 5, 33, 0, 0, 44, 45, 3, 2, 1, 0, 45, 46, 5, 34, 0, 0, 46, 1, 1, 0, 0, 0, 47, 50, 3, 4, 2, 0, 48, 50, 3, 18, 9, 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, 55, 3, 36, 18, 0, 54, 53, 1, 0, 0, 0, 54, 55, 1, 0, 0, 0, 55, 57, 1, 0, 0, 0, 56, 58, 3, 30, 15, 0, 57, 56, 1, 0, 0, 0, 57, 58, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 60, 5, 22, 0, 0, 60, 64, 5, 33, 0, 0, 61, 63, 3, 6, 3, 0, 62, 61, 1, 0, 0, 0, 63, 66, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 70, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 69, 3, 8, 4, 0, 68, 67, 1, 0, 0, 0, 69, 72, 1, 0, 0, 0, 70, 68, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 73, 1, 0, 0, 0, 72, 70, 1, 0, 0, 0, 73, 74, 5, 34, 0, 0, 74, 5, 1, 0, 0, 0, 75, 77, 3, 30, 15, 0, 76, 75, 1, 0, 0, 0, 76, 77, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, 5, 2, 0, 0, 79, 85, 5, 22, 0, 0, 80, 81, 3, 16, 8, 0, 81, 82, 5, 22, 0, 0, 82, 84, 1, 0, 0, 0, 83, 80, 1, 0, 0, 0, 84, 87, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 88, 1, 0, 0, 0, 87, 85, 1, 0, 0, 0, 88, 89, 5, 31, 0, 0, 89, 7, 1, 0, 0, 0, 90, 92, 5, 3, 0, 0, 91, 93, 3, 30, 15, 0, 92, 91, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 94, 1, 0, 0, 0, 94, 95, 5, 22, 0, 0, 95, 96, 5, 31, 0, 0, 96, 9, 1, 0, 0, 0, 97, 98, 3, 12, 6, 0, 98, 99, 5, 4, 0, 0, 99, 100, 3, 12, 6, 0, 100, 11, 1, 0, 0, 0, 101, 107, 3, 14, 7, 0, 102, 103, 3, 16, 8, 0, 103, 104, 3, 14, 7, 0, 104, 106, 1, 0, 0, 0, 105, 102, 1, 0, 0, 0, 106, 109, 1, 0, 0, 0, 107, 105, 1, 0, 0, 0, 107, 108, 1, 0, 0, 0, 108, 13, 1, 0, 0, 0, 109, 107, 1, 0, 0, 0, 110, 111, 5, 33, 0, 0, 111, 112, 3, 12, 6, 0, 112, 113, 5, 34, 0, 0, 113, 116, 1, 0, 0, 0, 114, 116, 5, 23, 0, 0, 115, 110, 1, 0, 0, 0, 115, 114, 1, 0, 0, 0, 116, 15, 1, 0, 0, 0, 117, 118, 7, 0, 0, 0, 118, 17, 1, 0, 0, 0, 119, 121, 3, 36, 18, 0, 120, 119, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 123, 1, 0, 0, 0, 122, 124, 3, 30, 15, 0, 123, 122, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 126, 1, 0, 0, 0, 125, 127, 3, 34, 17, 0, 126, 125, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 129, 5, 22, 0, 0, 129, 131, 5, 28, 0, 0, 130, 132, 3, 22, 11, 0, 131, 130, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 5, 29, 0, 0, 134, 135, 3, 20, 10, 0, 135, 19, 1, 0, 0, 0, 136, 140, 5, 33, 0, 0, 137, 139, 3, 26, 13, 0, 138, 137, 1, 0, 0, 0, 139, 142, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 143, 1, 0, 0, 0, 142, 140, 1, 0, 0, 0, 143, 144, 3, 24, 12, 0, 144, 145, 5, 34, 0, 0, 145, 21, 1, 0, 0, 0, 146, 151, 3, 28, 14, 0, 147, 148, 5, 32, 0, 0, 148, 150, 3, 28, 14, 0, 149, 147, 1, 0, 0, 0, 150, 153, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 23, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 154, 155, 5, 7, 0, 0, 155, 160, 3, 28, 14, 0, 156, 157, 5, 32, 0, 0, 157, 159, 3, 28, 14, 0, 158, 156, 1, 0, 0, 0, 159, 162, 1, 0, 0, 0, 160, 158, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 163, 1, 0, 0, 0, 162, 160, 1, 0, 0, 0, 163, 164, 5, 31, 0, 0, 164, 25, 1, 0, 0, 0, 165, 166, 5, 2, 0, 0, 166, 167, 5, 22, 0, 0, 167, 168, 5, 30, 0, 0, 168, 169, 5, 23, 0, 0, 169, 170, 5, 31, 0, 0, 170, 27, 1, 0, 0, 0, 171, 173, 3, 32, 16, 0, 172, 174, 5, 8, 0, 0, 173, 172, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 175, 1, 0, 0, 0, 175, 176, 5, 22, 0, 0, 176, 29, 1, 0, 0, 0, 177, 178, 7, 1, 0, 0, 178, 31, 1, 0, 0, 0, 179, 180, 7, 2, 0, 0, 180, 33, 1, 0, 0, 0, 181, 182, 7, 3, 0, 0, 182, 35, 1, 0, 0, 0, 183, 184, 5, 24, 0, 0, 184, 37, 1, 0, 0, 0, 20, 39, 49, 51, 54, 57, 64, 70, 76, 85, 92, 107, 115, 120, 123, 126, 131, 140, 151, 160, 173]
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirements.tokens b/src/main/java/org/lumijiez/parser/SoftwareRequirements.tokens
index 1eb4d46..3567d7b 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirements.tokens
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirements.tokens
@@ -15,44 +15,52 @@ T__13=14
 T__14=15
 T__15=16
 T__16=17
-ID=18
-STRING=19
-DESCRIPTION=20
-WS=21
-INT=22
-FLOAT=23
-LPAREN=24
-RPAREN=25
-COLON=26
-SEMICOLON=27
-COMMA=28
-LBRACE=29
-RBRACE=30
-TILDE=31
-EXCLAM=32
-'=>'=1
-'&&'=2
-'||'=3
-'()'=4
-'Access '=5
-'Return'=6
-'INT'=7
-'FLOAT'=8
-'DOUBLE'=9
-'STRING'=10
-'BOOLEAN'=11
-'CHAR'=12
-'VOID'=13
-'PUBLIC'=14
-'PROTECTED'=15
-'PRIVATE'=16
-'DEFAULT'=17
-'('=24
-')'=25
-':'=26
-';'=27
-','=28
-'{'=29
-'}'=30
-'~'=31
-'!'=32
+T__17=18
+T__18=19
+T__19=20
+T__20=21
+ID=22
+STRING=23
+DESCRIPTION=24
+WS=25
+INT=26
+FLOAT=27
+LPAREN=28
+RPAREN=29
+COLON=30
+SEMICOLON=31
+COMMA=32
+LBRACE=33
+RBRACE=34
+TILDE=35
+EXCLAM=36
+'package'=1
+'@'=2
+'result'=3
+'=>'=4
+'&&'=5
+'||'=6
+'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
+'('=28
+')'=29
+':'=30
+';'=31
+','=32
+'{'=33
+'}'=34
+'~'=35
+'!'=36
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseListener.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseListener.java
index 0c7b537..05de305 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseListener.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseListener.java
@@ -24,6 +24,18 @@ public class SoftwareRequirementsBaseListener implements SoftwareRequirementsLis
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitProgram(SoftwareRequirementsParser.ProgramContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -41,13 +53,25 @@ public class SoftwareRequirementsBaseListener implements SoftwareRequirementsLis
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterDescription(SoftwareRequirementsParser.DescriptionContext ctx) { }
+	@Override public void enterReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitDescription(SoftwareRequirementsParser.DescriptionContext ctx) { }
+	@Override public void exitReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -113,13 +137,25 @@ public class SoftwareRequirementsBaseListener implements SoftwareRequirementsLis
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx) { }
+	@Override public void enterFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx) { }
+	@Override public void exitFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterInput_types(SoftwareRequirementsParser.Input_typesContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitInput_types(SoftwareRequirementsParser.Input_typesContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -137,37 +173,37 @@ public class SoftwareRequirementsBaseListener implements SoftwareRequirementsLis
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterReturn(SoftwareRequirementsParser.ReturnContext ctx) { }
+	@Override public void enterSpecification(SoftwareRequirementsParser.SpecificationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitReturn(SoftwareRequirementsParser.ReturnContext ctx) { }
+	@Override public void exitSpecification(SoftwareRequirementsParser.SpecificationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx) { }
+	@Override public void enterVariable(SoftwareRequirementsParser.VariableContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx) { }
+	@Override public void exitVariable(SoftwareRequirementsParser.VariableContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterParameter(SoftwareRequirementsParser.ParameterContext ctx) { }
+	@Override public void enterImportance(SoftwareRequirementsParser.ImportanceContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitParameter(SoftwareRequirementsParser.ParameterContext ctx) { }
+	@Override public void exitImportance(SoftwareRequirementsParser.ImportanceContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -192,6 +228,18 @@ public class SoftwareRequirementsBaseListener implements SoftwareRequirementsLis
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitAccess_modifiers(SoftwareRequirementsParser.Access_modifiersContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDescription(SoftwareRequirementsParser.DescriptionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDescription(SoftwareRequirementsParser.DescriptionContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseVisitor.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseVisitor.java
index bf6c7b0..0a27449 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseVisitor.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsBaseVisitor.java
@@ -19,6 +19,13 @@ public class SoftwareRequirementsBaseVisitor<T> extends AbstractParseTreeVisitor
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitProgram(SoftwareRequirementsParser.ProgramContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -32,7 +39,14 @@ public class SoftwareRequirementsBaseVisitor<T> extends AbstractParseTreeVisitor
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitDescription(SoftwareRequirementsParser.DescriptionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -74,7 +88,14 @@ public class SoftwareRequirementsBaseVisitor<T> extends AbstractParseTreeVisitor
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx) { return visitChildren(ctx); }
+	@Override public T visitFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitInput_types(SoftwareRequirementsParser.Input_typesContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -88,21 +109,21 @@ public class SoftwareRequirementsBaseVisitor<T> extends AbstractParseTreeVisitor
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitReturn(SoftwareRequirementsParser.ReturnContext ctx) { return visitChildren(ctx); }
+	@Override public T visitSpecification(SoftwareRequirementsParser.SpecificationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx) { return visitChildren(ctx); }
+	@Override public T visitVariable(SoftwareRequirementsParser.VariableContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitParameter(SoftwareRequirementsParser.ParameterContext ctx) { return visitChildren(ctx); }
+	@Override public T visitImportance(SoftwareRequirementsParser.ImportanceContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -117,4 +138,11 @@ public class SoftwareRequirementsBaseVisitor<T> extends AbstractParseTreeVisitor
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitAccess_modifiers(SoftwareRequirementsParser.Access_modifiersContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitDescription(SoftwareRequirementsParser.DescriptionContext ctx) { return visitChildren(ctx); }
 }
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.interp b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.interp
index 16cf7d9..efb89b5 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.interp
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.interp
@@ -1,11 +1,15 @@
 token literal names:
 null
+'package'
+'@'
+'result'
 '=>'
 '&&'
 '||'
-'()'
-'Access '
-'Return'
+'return'
+'[]'
+'critical'
+'optional'
 'INT'
 'FLOAT'
 'DOUBLE'
@@ -13,10 +17,10 @@ null
 'BOOLEAN'
 'CHAR'
 'VOID'
-'PUBLIC'
-'PROTECTED'
-'PRIVATE'
-'DEFAULT'
+'public'
+'protected'
+'private'
+'default'
 null
 null
 null
@@ -52,6 +56,10 @@ null
 null
 null
 null
+null
+null
+null
+null
 ID
 STRING
 DESCRIPTION
@@ -86,6 +94,10 @@ T__13
 T__14
 T__15
 T__16
+T__17
+T__18
+T__19
+T__20
 ID
 STRING
 DESCRIPTION
@@ -110,4 +122,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[4, 0, 32, 240, 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, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 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, 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, 9, 1, 9, 1, 9, 1, 9, 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, 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, 14, 1, 14, 1, 15, 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, 4, 17, 169, 8, 17, 11, 17, 12, 17, 170, 1, 18, 1, 18, 5, 18, 175, 8, 18, 10, 18, 12, 18, 178, 9, 18, 1, 18, 1, 18, 1, 19, 1, 19, 5, 19, 184, 8, 19, 10, 19, 12, 19, 187, 9, 19, 1, 19, 1, 19, 1, 20, 4, 20, 192, 8, 20, 11, 20, 12, 20, 193, 1, 20, 1, 20, 1, 21, 4, 21, 199, 8, 21, 11, 21, 12, 21, 200, 1, 22, 4, 22, 204, 8, 22, 11, 22, 12, 22, 205, 1, 22, 1, 22, 5, 22, 210, 8, 22, 10, 22, 12, 22, 213, 9, 22, 1, 22, 1, 22, 4, 22, 217, 8, 22, 11, 22, 12, 22, 218, 3, 22, 221, 8, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 185, 0, 32, 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, 1, 0, 5, 2, 0, 65, 90, 97, 122, 1, 0, 34, 34, 1, 0, 126, 126, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 248, 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, 1, 65, 1, 0, 0, 0, 3, 68, 1, 0, 0, 0, 5, 71, 1, 0, 0, 0, 7, 74, 1, 0, 0, 0, 9, 77, 1, 0, 0, 0, 11, 85, 1, 0, 0, 0, 13, 92, 1, 0, 0, 0, 15, 96, 1, 0, 0, 0, 17, 102, 1, 0, 0, 0, 19, 109, 1, 0, 0, 0, 21, 116, 1, 0, 0, 0, 23, 124, 1, 0, 0, 0, 25, 129, 1, 0, 0, 0, 27, 134, 1, 0, 0, 0, 29, 141, 1, 0, 0, 0, 31, 151, 1, 0, 0, 0, 33, 159, 1, 0, 0, 0, 35, 168, 1, 0, 0, 0, 37, 172, 1, 0, 0, 0, 39, 181, 1, 0, 0, 0, 41, 191, 1, 0, 0, 0, 43, 198, 1, 0, 0, 0, 45, 220, 1, 0, 0, 0, 47, 222, 1, 0, 0, 0, 49, 224, 1, 0, 0, 0, 51, 226, 1, 0, 0, 0, 53, 228, 1, 0, 0, 0, 55, 230, 1, 0, 0, 0, 57, 232, 1, 0, 0, 0, 59, 234, 1, 0, 0, 0, 61, 236, 1, 0, 0, 0, 63, 238, 1, 0, 0, 0, 65, 66, 5, 61, 0, 0, 66, 67, 5, 62, 0, 0, 67, 2, 1, 0, 0, 0, 68, 69, 5, 38, 0, 0, 69, 70, 5, 38, 0, 0, 70, 4, 1, 0, 0, 0, 71, 72, 5, 124, 0, 0, 72, 73, 5, 124, 0, 0, 73, 6, 1, 0, 0, 0, 74, 75, 5, 40, 0, 0, 75, 76, 5, 41, 0, 0, 76, 8, 1, 0, 0, 0, 77, 78, 5, 65, 0, 0, 78, 79, 5, 99, 0, 0, 79, 80, 5, 99, 0, 0, 80, 81, 5, 101, 0, 0, 81, 82, 5, 115, 0, 0, 82, 83, 5, 115, 0, 0, 83, 84, 5, 32, 0, 0, 84, 10, 1, 0, 0, 0, 85, 86, 5, 82, 0, 0, 86, 87, 5, 101, 0, 0, 87, 88, 5, 116, 0, 0, 88, 89, 5, 117, 0, 0, 89, 90, 5, 114, 0, 0, 90, 91, 5, 110, 0, 0, 91, 12, 1, 0, 0, 0, 92, 93, 5, 73, 0, 0, 93, 94, 5, 78, 0, 0, 94, 95, 5, 84, 0, 0, 95, 14, 1, 0, 0, 0, 96, 97, 5, 70, 0, 0, 97, 98, 5, 76, 0, 0, 98, 99, 5, 79, 0, 0, 99, 100, 5, 65, 0, 0, 100, 101, 5, 84, 0, 0, 101, 16, 1, 0, 0, 0, 102, 103, 5, 68, 0, 0, 103, 104, 5, 79, 0, 0, 104, 105, 5, 85, 0, 0, 105, 106, 5, 66, 0, 0, 106, 107, 5, 76, 0, 0, 107, 108, 5, 69, 0, 0, 108, 18, 1, 0, 0, 0, 109, 110, 5, 83, 0, 0, 110, 111, 5, 84, 0, 0, 111, 112, 5, 82, 0, 0, 112, 113, 5, 73, 0, 0, 113, 114, 5, 78, 0, 0, 114, 115, 5, 71, 0, 0, 115, 20, 1, 0, 0, 0, 116, 117, 5, 66, 0, 0, 117, 118, 5, 79, 0, 0, 118, 119, 5, 79, 0, 0, 119, 120, 5, 76, 0, 0, 120, 121, 5, 69, 0, 0, 121, 122, 5, 65, 0, 0, 122, 123, 5, 78, 0, 0, 123, 22, 1, 0, 0, 0, 124, 125, 5, 67, 0, 0, 125, 126, 5, 72, 0, 0, 126, 127, 5, 65, 0, 0, 127, 128, 5, 82, 0, 0, 128, 24, 1, 0, 0, 0, 129, 130, 5, 86, 0, 0, 130, 131, 5, 79, 0, 0, 131, 132, 5, 73, 0, 0, 132, 133, 5, 68, 0, 0, 133, 26, 1, 0, 0, 0, 134, 135, 5, 80, 0, 0, 135, 136, 5, 85, 0, 0, 136, 137, 5, 66, 0, 0, 137, 138, 5, 76, 0, 0, 138, 139, 5, 73, 0, 0, 139, 140, 5, 67, 0, 0, 140, 28, 1, 0, 0, 0, 141, 142, 5, 80, 0, 0, 142, 143, 5, 82, 0, 0, 143, 144, 5, 79, 0, 0, 144, 145, 5, 84, 0, 0, 145, 146, 5, 69, 0, 0, 146, 147, 5, 67, 0, 0, 147, 148, 5, 84, 0, 0, 148, 149, 5, 69, 0, 0, 149, 150, 5, 68, 0, 0, 150, 30, 1, 0, 0, 0, 151, 152, 5, 80, 0, 0, 152, 153, 5, 82, 0, 0, 153, 154, 5, 73, 0, 0, 154, 155, 5, 86, 0, 0, 155, 156, 5, 65, 0, 0, 156, 157, 5, 84, 0, 0, 157, 158, 5, 69, 0, 0, 158, 32, 1, 0, 0, 0, 159, 160, 5, 68, 0, 0, 160, 161, 5, 69, 0, 0, 161, 162, 5, 70, 0, 0, 162, 163, 5, 65, 0, 0, 163, 164, 5, 85, 0, 0, 164, 165, 5, 76, 0, 0, 165, 166, 5, 84, 0, 0, 166, 34, 1, 0, 0, 0, 167, 169, 7, 0, 0, 0, 168, 167, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 170, 171, 1, 0, 0, 0, 171, 36, 1, 0, 0, 0, 172, 176, 5, 34, 0, 0, 173, 175, 8, 1, 0, 0, 174, 173, 1, 0, 0, 0, 175, 178, 1, 0, 0, 0, 176, 174, 1, 0, 0, 0, 176, 177, 1, 0, 0, 0, 177, 179, 1, 0, 0, 0, 178, 176, 1, 0, 0, 0, 179, 180, 5, 34, 0, 0, 180, 38, 1, 0, 0, 0, 181, 185, 5, 126, 0, 0, 182, 184, 8, 2, 0, 0, 183, 182, 1, 0, 0, 0, 184, 187, 1, 0, 0, 0, 185, 186, 1, 0, 0, 0, 185, 183, 1, 0, 0, 0, 186, 188, 1, 0, 0, 0, 187, 185, 1, 0, 0, 0, 188, 189, 5, 126, 0, 0, 189, 40, 1, 0, 0, 0, 190, 192, 7, 3, 0, 0, 191, 190, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193, 191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 196, 6, 20, 0, 0, 196, 42, 1, 0, 0, 0, 197, 199, 7, 4, 0, 0, 198, 197, 1, 0, 0, 0, 199, 200, 1, 0, 0, 0, 200, 198, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 44, 1, 0, 0, 0, 202, 204, 7, 4, 0, 0, 203, 202, 1, 0, 0, 0, 204, 205, 1, 0, 0, 0, 205, 203, 1, 0, 0, 0, 205, 206, 1, 0, 0, 0, 206, 207, 1, 0, 0, 0, 207, 211, 5, 46, 0, 0, 208, 210, 7, 4, 0, 0, 209, 208, 1, 0, 0, 0, 210, 213, 1, 0, 0, 0, 211, 209, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 221, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 214, 216, 5, 46, 0, 0, 215, 217, 7, 4, 0, 0, 216, 215, 1, 0, 0, 0, 217, 218, 1, 0, 0, 0, 218, 216, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219, 221, 1, 0, 0, 0, 220, 203, 1, 0, 0, 0, 220, 214, 1, 0, 0, 0, 221, 46, 1, 0, 0, 0, 222, 223, 5, 40, 0, 0, 223, 48, 1, 0, 0, 0, 224, 225, 5, 41, 0, 0, 225, 50, 1, 0, 0, 0, 226, 227, 5, 58, 0, 0, 227, 52, 1, 0, 0, 0, 228, 229, 5, 59, 0, 0, 229, 54, 1, 0, 0, 0, 230, 231, 5, 44, 0, 0, 231, 56, 1, 0, 0, 0, 232, 233, 5, 123, 0, 0, 233, 58, 1, 0, 0, 0, 234, 235, 5, 125, 0, 0, 235, 60, 1, 0, 0, 0, 236, 237, 5, 126, 0, 0, 237, 62, 1, 0, 0, 0, 238, 239, 5, 33, 0, 0, 239, 64, 1, 0, 0, 0, 10, 0, 170, 176, 185, 193, 200, 205, 211, 218, 220, 1, 6, 0, 0]
\ No newline at end of file
+[4, 0, 36, 275, 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, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 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, 4, 21, 204, 8, 21, 11, 21, 12, 21, 205, 1, 22, 1, 22, 5, 22, 210, 8, 22, 10, 22, 12, 22, 213, 9, 22, 1, 22, 1, 22, 1, 23, 1, 23, 5, 23, 219, 8, 23, 10, 23, 12, 23, 222, 9, 23, 1, 23, 1, 23, 1, 24, 4, 24, 227, 8, 24, 11, 24, 12, 24, 228, 1, 24, 1, 24, 1, 25, 4, 25, 234, 8, 25, 11, 25, 12, 25, 235, 1, 26, 4, 26, 239, 8, 26, 11, 26, 12, 26, 240, 1, 26, 1, 26, 5, 26, 245, 8, 26, 10, 26, 12, 26, 248, 9, 26, 1, 26, 1, 26, 4, 26, 252, 8, 26, 11, 26, 12, 26, 253, 3, 26, 256, 8, 26, 1, 27, 1, 27, 1, 28, 1, 28, 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, 220, 0, 36, 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, 1, 0, 5, 2, 0, 65, 90, 97, 122, 1, 0, 34, 34, 1, 0, 126, 126, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 283, 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, 1, 73, 1, 0, 0, 0, 3, 81, 1, 0, 0, 0, 5, 83, 1, 0, 0, 0, 7, 90, 1, 0, 0, 0, 9, 93, 1, 0, 0, 0, 11, 96, 1, 0, 0, 0, 13, 99, 1, 0, 0, 0, 15, 106, 1, 0, 0, 0, 17, 109, 1, 0, 0, 0, 19, 118, 1, 0, 0, 0, 21, 127, 1, 0, 0, 0, 23, 131, 1, 0, 0, 0, 25, 137, 1, 0, 0, 0, 27, 144, 1, 0, 0, 0, 29, 151, 1, 0, 0, 0, 31, 159, 1, 0, 0, 0, 33, 164, 1, 0, 0, 0, 35, 169, 1, 0, 0, 0, 37, 176, 1, 0, 0, 0, 39, 186, 1, 0, 0, 0, 41, 194, 1, 0, 0, 0, 43, 203, 1, 0, 0, 0, 45, 207, 1, 0, 0, 0, 47, 216, 1, 0, 0, 0, 49, 226, 1, 0, 0, 0, 51, 233, 1, 0, 0, 0, 53, 255, 1, 0, 0, 0, 55, 257, 1, 0, 0, 0, 57, 259, 1, 0, 0, 0, 59, 261, 1, 0, 0, 0, 61, 263, 1, 0, 0, 0, 63, 265, 1, 0, 0, 0, 65, 267, 1, 0, 0, 0, 67, 269, 1, 0, 0, 0, 69, 271, 1, 0, 0, 0, 71, 273, 1, 0, 0, 0, 73, 74, 5, 112, 0, 0, 74, 75, 5, 97, 0, 0, 75, 76, 5, 99, 0, 0, 76, 77, 5, 107, 0, 0, 77, 78, 5, 97, 0, 0, 78, 79, 5, 103, 0, 0, 79, 80, 5, 101, 0, 0, 80, 2, 1, 0, 0, 0, 81, 82, 5, 64, 0, 0, 82, 4, 1, 0, 0, 0, 83, 84, 5, 114, 0, 0, 84, 85, 5, 101, 0, 0, 85, 86, 5, 115, 0, 0, 86, 87, 5, 117, 0, 0, 87, 88, 5, 108, 0, 0, 88, 89, 5, 116, 0, 0, 89, 6, 1, 0, 0, 0, 90, 91, 5, 61, 0, 0, 91, 92, 5, 62, 0, 0, 92, 8, 1, 0, 0, 0, 93, 94, 5, 38, 0, 0, 94, 95, 5, 38, 0, 0, 95, 10, 1, 0, 0, 0, 96, 97, 5, 124, 0, 0, 97, 98, 5, 124, 0, 0, 98, 12, 1, 0, 0, 0, 99, 100, 5, 114, 0, 0, 100, 101, 5, 101, 0, 0, 101, 102, 5, 116, 0, 0, 102, 103, 5, 117, 0, 0, 103, 104, 5, 114, 0, 0, 104, 105, 5, 110, 0, 0, 105, 14, 1, 0, 0, 0, 106, 107, 5, 91, 0, 0, 107, 108, 5, 93, 0, 0, 108, 16, 1, 0, 0, 0, 109, 110, 5, 99, 0, 0, 110, 111, 5, 114, 0, 0, 111, 112, 5, 105, 0, 0, 112, 113, 5, 116, 0, 0, 113, 114, 5, 105, 0, 0, 114, 115, 5, 99, 0, 0, 115, 116, 5, 97, 0, 0, 116, 117, 5, 108, 0, 0, 117, 18, 1, 0, 0, 0, 118, 119, 5, 111, 0, 0, 119, 120, 5, 112, 0, 0, 120, 121, 5, 116, 0, 0, 121, 122, 5, 105, 0, 0, 122, 123, 5, 111, 0, 0, 123, 124, 5, 110, 0, 0, 124, 125, 5, 97, 0, 0, 125, 126, 5, 108, 0, 0, 126, 20, 1, 0, 0, 0, 127, 128, 5, 73, 0, 0, 128, 129, 5, 78, 0, 0, 129, 130, 5, 84, 0, 0, 130, 22, 1, 0, 0, 0, 131, 132, 5, 70, 0, 0, 132, 133, 5, 76, 0, 0, 133, 134, 5, 79, 0, 0, 134, 135, 5, 65, 0, 0, 135, 136, 5, 84, 0, 0, 136, 24, 1, 0, 0, 0, 137, 138, 5, 68, 0, 0, 138, 139, 5, 79, 0, 0, 139, 140, 5, 85, 0, 0, 140, 141, 5, 66, 0, 0, 141, 142, 5, 76, 0, 0, 142, 143, 5, 69, 0, 0, 143, 26, 1, 0, 0, 0, 144, 145, 5, 83, 0, 0, 145, 146, 5, 84, 0, 0, 146, 147, 5, 82, 0, 0, 147, 148, 5, 73, 0, 0, 148, 149, 5, 78, 0, 0, 149, 150, 5, 71, 0, 0, 150, 28, 1, 0, 0, 0, 151, 152, 5, 66, 0, 0, 152, 153, 5, 79, 0, 0, 153, 154, 5, 79, 0, 0, 154, 155, 5, 76, 0, 0, 155, 156, 5, 69, 0, 0, 156, 157, 5, 65, 0, 0, 157, 158, 5, 78, 0, 0, 158, 30, 1, 0, 0, 0, 159, 160, 5, 67, 0, 0, 160, 161, 5, 72, 0, 0, 161, 162, 5, 65, 0, 0, 162, 163, 5, 82, 0, 0, 163, 32, 1, 0, 0, 0, 164, 165, 5, 86, 0, 0, 165, 166, 5, 79, 0, 0, 166, 167, 5, 73, 0, 0, 167, 168, 5, 68, 0, 0, 168, 34, 1, 0, 0, 0, 169, 170, 5, 112, 0, 0, 170, 171, 5, 117, 0, 0, 171, 172, 5, 98, 0, 0, 172, 173, 5, 108, 0, 0, 173, 174, 5, 105, 0, 0, 174, 175, 5, 99, 0, 0, 175, 36, 1, 0, 0, 0, 176, 177, 5, 112, 0, 0, 177, 178, 5, 114, 0, 0, 178, 179, 5, 111, 0, 0, 179, 180, 5, 116, 0, 0, 180, 181, 5, 101, 0, 0, 181, 182, 5, 99, 0, 0, 182, 183, 5, 116, 0, 0, 183, 184, 5, 101, 0, 0, 184, 185, 5, 100, 0, 0, 185, 38, 1, 0, 0, 0, 186, 187, 5, 112, 0, 0, 187, 188, 5, 114, 0, 0, 188, 189, 5, 105, 0, 0, 189, 190, 5, 118, 0, 0, 190, 191, 5, 97, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 101, 0, 0, 193, 40, 1, 0, 0, 0, 194, 195, 5, 100, 0, 0, 195, 196, 5, 101, 0, 0, 196, 197, 5, 102, 0, 0, 197, 198, 5, 97, 0, 0, 198, 199, 5, 117, 0, 0, 199, 200, 5, 108, 0, 0, 200, 201, 5, 116, 0, 0, 201, 42, 1, 0, 0, 0, 202, 204, 7, 0, 0, 0, 203, 202, 1, 0, 0, 0, 204, 205, 1, 0, 0, 0, 205, 203, 1, 0, 0, 0, 205, 206, 1, 0, 0, 0, 206, 44, 1, 0, 0, 0, 207, 211, 5, 34, 0, 0, 208, 210, 8, 1, 0, 0, 209, 208, 1, 0, 0, 0, 210, 213, 1, 0, 0, 0, 211, 209, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 214, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 214, 215, 5, 34, 0, 0, 215, 46, 1, 0, 0, 0, 216, 220, 5, 126, 0, 0, 217, 219, 8, 2, 0, 0, 218, 217, 1, 0, 0, 0, 219, 222, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 221, 223, 1, 0, 0, 0, 222, 220, 1, 0, 0, 0, 223, 224, 5, 126, 0, 0, 224, 48, 1, 0, 0, 0, 225, 227, 7, 3, 0, 0, 226, 225, 1, 0, 0, 0, 227, 228, 1, 0, 0, 0, 228, 226, 1, 0, 0, 0, 228, 229, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 231, 6, 24, 0, 0, 231, 50, 1, 0, 0, 0, 232, 234, 7, 4, 0, 0, 233, 232, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 52, 1, 0, 0, 0, 237, 239, 7, 4, 0, 0, 238, 237, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0, 240, 238, 1, 0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 246, 5, 46, 0, 0, 243, 245, 7, 4, 0, 0, 244, 243, 1, 0, 0, 0, 245, 248, 1, 0, 0, 0, 246, 244, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 256, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 249, 251, 5, 46, 0, 0, 250, 252, 7, 4, 0, 0, 251, 250, 1, 0, 0, 0, 252, 253, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 256, 1, 0, 0, 0, 255, 238, 1, 0, 0, 0, 255, 249, 1, 0, 0, 0, 256, 54, 1, 0, 0, 0, 257, 258, 5, 40, 0, 0, 258, 56, 1, 0, 0, 0, 259, 260, 5, 41, 0, 0, 260, 58, 1, 0, 0, 0, 261, 262, 5, 58, 0, 0, 262, 60, 1, 0, 0, 0, 263, 264, 5, 59, 0, 0, 264, 62, 1, 0, 0, 0, 265, 266, 5, 44, 0, 0, 266, 64, 1, 0, 0, 0, 267, 268, 5, 123, 0, 0, 268, 66, 1, 0, 0, 0, 269, 270, 5, 125, 0, 0, 270, 68, 1, 0, 0, 0, 271, 272, 5, 126, 0, 0, 272, 70, 1, 0, 0, 0, 273, 274, 5, 33, 0, 0, 274, 72, 1, 0, 0, 0, 10, 0, 205, 211, 220, 228, 235, 240, 246, 253, 255, 1, 6, 0, 0]
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.java
index a186173..e827f4e 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.java
@@ -19,9 +19,9 @@ public class SoftwareRequirementsLexer 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, 
-		ID=18, STRING=19, DESCRIPTION=20, WS=21, INT=22, FLOAT=23, LPAREN=24, 
-		RPAREN=25, COLON=26, SEMICOLON=27, COMMA=28, LBRACE=29, RBRACE=30, TILDE=31, 
-		EXCLAM=32;
+		T__17=18, T__18=19, T__19=20, T__20=21, ID=22, STRING=23, DESCRIPTION=24, 
+		WS=25, INT=26, FLOAT=27, LPAREN=28, RPAREN=29, COLON=30, SEMICOLON=31, 
+		COMMA=32, LBRACE=33, RBRACE=34, TILDE=35, EXCLAM=36;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -34,27 +34,29 @@ public class SoftwareRequirementsLexer 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", 
-			"ID", "STRING", "DESCRIPTION", "WS", "INT", "FLOAT", "LPAREN", "RPAREN", 
-			"COLON", "SEMICOLON", "COMMA", "LBRACE", "RBRACE", "TILDE", "EXCLAM"
+			"T__17", "T__18", "T__19", "T__20", "ID", "STRING", "DESCRIPTION", "WS", 
+			"INT", "FLOAT", "LPAREN", "RPAREN", "COLON", "SEMICOLON", "COMMA", "LBRACE", 
+			"RBRACE", "TILDE", "EXCLAM"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'=>'", "'&&'", "'||'", "'()'", "'Access '", "'Return'", "'INT'", 
-			"'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", "'CHAR'", "'VOID'", "'PUBLIC'", 
-			"'PROTECTED'", "'PRIVATE'", "'DEFAULT'", null, null, null, null, null, 
-			null, "'('", "')'", "':'", "';'", "','", "'{'", "'}'", "'~'", "'!'"
+			null, "'package'", "'@'", "'result'", "'=>'", "'&&'", "'||'", "'return'", 
+			"'[]'", "'critical'", "'optional'", "'INT'", "'FLOAT'", "'DOUBLE'", "'STRING'", 
+			"'BOOLEAN'", "'CHAR'", "'VOID'", "'public'", "'protected'", "'private'", 
+			"'default'", null, null, null, null, null, null, "'('", "')'", "':'", 
+			"';'", "','", "'{'", "'}'", "'~'", "'!'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
 	private static String[] makeSymbolicNames() {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, "ID", "STRING", "DESCRIPTION", "WS", 
-			"INT", "FLOAT", "LPAREN", "RPAREN", "COLON", "SEMICOLON", "COMMA", "LBRACE", 
-			"RBRACE", "TILDE", "EXCLAM"
+			null, null, null, null, null, null, null, null, null, null, "ID", "STRING", 
+			"DESCRIPTION", "WS", "INT", "FLOAT", "LPAREN", "RPAREN", "COLON", "SEMICOLON", 
+			"COMMA", "LBRACE", "RBRACE", "TILDE", "EXCLAM"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -116,7 +118,7 @@ public class SoftwareRequirementsLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\u0004\u0000 \u00f0\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
+		"\u0004\u0000$\u0113\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"+
@@ -126,146 +128,167 @@ public class SoftwareRequirementsLexer extends Lexer {
 		"\u0015\u0007\u0015\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002"+
 		"\u0018\u0007\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002"+
 		"\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002"+
-		"\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0001\u0000\u0001\u0000\u0001"+
-		"\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001"+
-		"\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0001\u0004\u0001\u0004\u0001\u0004\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\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"+
-		"\t\u0001\t\u0001\t\u0001\t\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\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\u000e\u0001"+
-		"\u000e\u0001\u000f\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\u0004"+
-		"\u0011\u00a9\b\u0011\u000b\u0011\f\u0011\u00aa\u0001\u0012\u0001\u0012"+
-		"\u0005\u0012\u00af\b\u0012\n\u0012\f\u0012\u00b2\t\u0012\u0001\u0012\u0001"+
-		"\u0012\u0001\u0013\u0001\u0013\u0005\u0013\u00b8\b\u0013\n\u0013\f\u0013"+
-		"\u00bb\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0004\u0014\u00c0\b"+
-		"\u0014\u000b\u0014\f\u0014\u00c1\u0001\u0014\u0001\u0014\u0001\u0015\u0004"+
-		"\u0015\u00c7\b\u0015\u000b\u0015\f\u0015\u00c8\u0001\u0016\u0004\u0016"+
-		"\u00cc\b\u0016\u000b\u0016\f\u0016\u00cd\u0001\u0016\u0001\u0016\u0005"+
-		"\u0016\u00d2\b\u0016\n\u0016\f\u0016\u00d5\t\u0016\u0001\u0016\u0001\u0016"+
-		"\u0004\u0016\u00d9\b\u0016\u000b\u0016\f\u0016\u00da\u0003\u0016\u00dd"+
-		"\b\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001"+
-		"\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001c\u0001"+
-		"\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f\u0001"+
-		"\u001f\u0001\u00b9\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? \u0001\u0000\u0005\u0002\u0000AZaz\u0001\u0000\"\"\u0001"+
-		"\u0000~~\u0003\u0000\t\n\r\r  \u0001\u000009\u00f8\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\u0000"+
-		"1\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\u0001A\u0001\u0000\u0000\u0000\u0003D\u0001"+
-		"\u0000\u0000\u0000\u0005G\u0001\u0000\u0000\u0000\u0007J\u0001\u0000\u0000"+
-		"\u0000\tM\u0001\u0000\u0000\u0000\u000bU\u0001\u0000\u0000\u0000\r\\\u0001"+
-		"\u0000\u0000\u0000\u000f`\u0001\u0000\u0000\u0000\u0011f\u0001\u0000\u0000"+
-		"\u0000\u0013m\u0001\u0000\u0000\u0000\u0015t\u0001\u0000\u0000\u0000\u0017"+
-		"|\u0001\u0000\u0000\u0000\u0019\u0081\u0001\u0000\u0000\u0000\u001b\u0086"+
-		"\u0001\u0000\u0000\u0000\u001d\u008d\u0001\u0000\u0000\u0000\u001f\u0097"+
-		"\u0001\u0000\u0000\u0000!\u009f\u0001\u0000\u0000\u0000#\u00a8\u0001\u0000"+
-		"\u0000\u0000%\u00ac\u0001\u0000\u0000\u0000\'\u00b5\u0001\u0000\u0000"+
-		"\u0000)\u00bf\u0001\u0000\u0000\u0000+\u00c6\u0001\u0000\u0000\u0000-"+
-		"\u00dc\u0001\u0000\u0000\u0000/\u00de\u0001\u0000\u0000\u00001\u00e0\u0001"+
-		"\u0000\u0000\u00003\u00e2\u0001\u0000\u0000\u00005\u00e4\u0001\u0000\u0000"+
-		"\u00007\u00e6\u0001\u0000\u0000\u00009\u00e8\u0001\u0000\u0000\u0000;"+
-		"\u00ea\u0001\u0000\u0000\u0000=\u00ec\u0001\u0000\u0000\u0000?\u00ee\u0001"+
-		"\u0000\u0000\u0000AB\u0005=\u0000\u0000BC\u0005>\u0000\u0000C\u0002\u0001"+
-		"\u0000\u0000\u0000DE\u0005&\u0000\u0000EF\u0005&\u0000\u0000F\u0004\u0001"+
-		"\u0000\u0000\u0000GH\u0005|\u0000\u0000HI\u0005|\u0000\u0000I\u0006\u0001"+
-		"\u0000\u0000\u0000JK\u0005(\u0000\u0000KL\u0005)\u0000\u0000L\b\u0001"+
-		"\u0000\u0000\u0000MN\u0005A\u0000\u0000NO\u0005c\u0000\u0000OP\u0005c"+
-		"\u0000\u0000PQ\u0005e\u0000\u0000QR\u0005s\u0000\u0000RS\u0005s\u0000"+
-		"\u0000ST\u0005 \u0000\u0000T\n\u0001\u0000\u0000\u0000UV\u0005R\u0000"+
-		"\u0000VW\u0005e\u0000\u0000WX\u0005t\u0000\u0000XY\u0005u\u0000\u0000"+
-		"YZ\u0005r\u0000\u0000Z[\u0005n\u0000\u0000[\f\u0001\u0000\u0000\u0000"+
-		"\\]\u0005I\u0000\u0000]^\u0005N\u0000\u0000^_\u0005T\u0000\u0000_\u000e"+
-		"\u0001\u0000\u0000\u0000`a\u0005F\u0000\u0000ab\u0005L\u0000\u0000bc\u0005"+
-		"O\u0000\u0000cd\u0005A\u0000\u0000de\u0005T\u0000\u0000e\u0010\u0001\u0000"+
-		"\u0000\u0000fg\u0005D\u0000\u0000gh\u0005O\u0000\u0000hi\u0005U\u0000"+
-		"\u0000ij\u0005B\u0000\u0000jk\u0005L\u0000\u0000kl\u0005E\u0000\u0000"+
-		"l\u0012\u0001\u0000\u0000\u0000mn\u0005S\u0000\u0000no\u0005T\u0000\u0000"+
-		"op\u0005R\u0000\u0000pq\u0005I\u0000\u0000qr\u0005N\u0000\u0000rs\u0005"+
-		"G\u0000\u0000s\u0014\u0001\u0000\u0000\u0000tu\u0005B\u0000\u0000uv\u0005"+
-		"O\u0000\u0000vw\u0005O\u0000\u0000wx\u0005L\u0000\u0000xy\u0005E\u0000"+
-		"\u0000yz\u0005A\u0000\u0000z{\u0005N\u0000\u0000{\u0016\u0001\u0000\u0000"+
-		"\u0000|}\u0005C\u0000\u0000}~\u0005H\u0000\u0000~\u007f\u0005A\u0000\u0000"+
-		"\u007f\u0080\u0005R\u0000\u0000\u0080\u0018\u0001\u0000\u0000\u0000\u0081"+
-		"\u0082\u0005V\u0000\u0000\u0082\u0083\u0005O\u0000\u0000\u0083\u0084\u0005"+
-		"I\u0000\u0000\u0084\u0085\u0005D\u0000\u0000\u0085\u001a\u0001\u0000\u0000"+
-		"\u0000\u0086\u0087\u0005P\u0000\u0000\u0087\u0088\u0005U\u0000\u0000\u0088"+
-		"\u0089\u0005B\u0000\u0000\u0089\u008a\u0005L\u0000\u0000\u008a\u008b\u0005"+
-		"I\u0000\u0000\u008b\u008c\u0005C\u0000\u0000\u008c\u001c\u0001\u0000\u0000"+
-		"\u0000\u008d\u008e\u0005P\u0000\u0000\u008e\u008f\u0005R\u0000\u0000\u008f"+
-		"\u0090\u0005O\u0000\u0000\u0090\u0091\u0005T\u0000\u0000\u0091\u0092\u0005"+
-		"E\u0000\u0000\u0092\u0093\u0005C\u0000\u0000\u0093\u0094\u0005T\u0000"+
-		"\u0000\u0094\u0095\u0005E\u0000\u0000\u0095\u0096\u0005D\u0000\u0000\u0096"+
-		"\u001e\u0001\u0000\u0000\u0000\u0097\u0098\u0005P\u0000\u0000\u0098\u0099"+
-		"\u0005R\u0000\u0000\u0099\u009a\u0005I\u0000\u0000\u009a\u009b\u0005V"+
-		"\u0000\u0000\u009b\u009c\u0005A\u0000\u0000\u009c\u009d\u0005T\u0000\u0000"+
-		"\u009d\u009e\u0005E\u0000\u0000\u009e \u0001\u0000\u0000\u0000\u009f\u00a0"+
-		"\u0005D\u0000\u0000\u00a0\u00a1\u0005E\u0000\u0000\u00a1\u00a2\u0005F"+
-		"\u0000\u0000\u00a2\u00a3\u0005A\u0000\u0000\u00a3\u00a4\u0005U\u0000\u0000"+
-		"\u00a4\u00a5\u0005L\u0000\u0000\u00a5\u00a6\u0005T\u0000\u0000\u00a6\""+
-		"\u0001\u0000\u0000\u0000\u00a7\u00a9\u0007\u0000\u0000\u0000\u00a8\u00a7"+
-		"\u0001\u0000\u0000\u0000\u00a9\u00aa\u0001\u0000\u0000\u0000\u00aa\u00a8"+
-		"\u0001\u0000\u0000\u0000\u00aa\u00ab\u0001\u0000\u0000\u0000\u00ab$\u0001"+
-		"\u0000\u0000\u0000\u00ac\u00b0\u0005\"\u0000\u0000\u00ad\u00af\b\u0001"+
-		"\u0000\u0000\u00ae\u00ad\u0001\u0000\u0000\u0000\u00af\u00b2\u0001\u0000"+
-		"\u0000\u0000\u00b0\u00ae\u0001\u0000\u0000\u0000\u00b0\u00b1\u0001\u0000"+
-		"\u0000\u0000\u00b1\u00b3\u0001\u0000\u0000\u0000\u00b2\u00b0\u0001\u0000"+
-		"\u0000\u0000\u00b3\u00b4\u0005\"\u0000\u0000\u00b4&\u0001\u0000\u0000"+
-		"\u0000\u00b5\u00b9\u0005~\u0000\u0000\u00b6\u00b8\b\u0002\u0000\u0000"+
-		"\u00b7\u00b6\u0001\u0000\u0000\u0000\u00b8\u00bb\u0001\u0000\u0000\u0000"+
-		"\u00b9\u00ba\u0001\u0000\u0000\u0000\u00b9\u00b7\u0001\u0000\u0000\u0000"+
-		"\u00ba\u00bc\u0001\u0000\u0000\u0000\u00bb\u00b9\u0001\u0000\u0000\u0000"+
-		"\u00bc\u00bd\u0005~\u0000\u0000\u00bd(\u0001\u0000\u0000\u0000\u00be\u00c0"+
-		"\u0007\u0003\u0000\u0000\u00bf\u00be\u0001\u0000\u0000\u0000\u00c0\u00c1"+
-		"\u0001\u0000\u0000\u0000\u00c1\u00bf\u0001\u0000\u0000\u0000\u00c1\u00c2"+
-		"\u0001\u0000\u0000\u0000\u00c2\u00c3\u0001\u0000\u0000\u0000\u00c3\u00c4"+
-		"\u0006\u0014\u0000\u0000\u00c4*\u0001\u0000\u0000\u0000\u00c5\u00c7\u0007"+
-		"\u0004\u0000\u0000\u00c6\u00c5\u0001\u0000\u0000\u0000\u00c7\u00c8\u0001"+
-		"\u0000\u0000\u0000\u00c8\u00c6\u0001\u0000\u0000\u0000\u00c8\u00c9\u0001"+
-		"\u0000\u0000\u0000\u00c9,\u0001\u0000\u0000\u0000\u00ca\u00cc\u0007\u0004"+
-		"\u0000\u0000\u00cb\u00ca\u0001\u0000\u0000\u0000\u00cc\u00cd\u0001\u0000"+
-		"\u0000\u0000\u00cd\u00cb\u0001\u0000\u0000\u0000\u00cd\u00ce\u0001\u0000"+
-		"\u0000\u0000\u00ce\u00cf\u0001\u0000\u0000\u0000\u00cf\u00d3\u0005.\u0000"+
-		"\u0000\u00d0\u00d2\u0007\u0004\u0000\u0000\u00d1\u00d0\u0001\u0000\u0000"+
-		"\u0000\u00d2\u00d5\u0001\u0000\u0000\u0000\u00d3\u00d1\u0001\u0000\u0000"+
-		"\u0000\u00d3\u00d4\u0001\u0000\u0000\u0000\u00d4\u00dd\u0001\u0000\u0000"+
-		"\u0000\u00d5\u00d3\u0001\u0000\u0000\u0000\u00d6\u00d8\u0005.\u0000\u0000"+
-		"\u00d7\u00d9\u0007\u0004\u0000\u0000\u00d8\u00d7\u0001\u0000\u0000\u0000"+
-		"\u00d9\u00da\u0001\u0000\u0000\u0000\u00da\u00d8\u0001\u0000\u0000\u0000"+
-		"\u00da\u00db\u0001\u0000\u0000\u0000\u00db\u00dd\u0001\u0000\u0000\u0000"+
-		"\u00dc\u00cb\u0001\u0000\u0000\u0000\u00dc\u00d6\u0001\u0000\u0000\u0000"+
-		"\u00dd.\u0001\u0000\u0000\u0000\u00de\u00df\u0005(\u0000\u0000\u00df0"+
-		"\u0001\u0000\u0000\u0000\u00e0\u00e1\u0005)\u0000\u0000\u00e12\u0001\u0000"+
-		"\u0000\u0000\u00e2\u00e3\u0005:\u0000\u0000\u00e34\u0001\u0000\u0000\u0000"+
-		"\u00e4\u00e5\u0005;\u0000\u0000\u00e56\u0001\u0000\u0000\u0000\u00e6\u00e7"+
-		"\u0005,\u0000\u0000\u00e78\u0001\u0000\u0000\u0000\u00e8\u00e9\u0005{"+
-		"\u0000\u0000\u00e9:\u0001\u0000\u0000\u0000\u00ea\u00eb\u0005}\u0000\u0000"+
-		"\u00eb<\u0001\u0000\u0000\u0000\u00ec\u00ed\u0005~\u0000\u0000\u00ed>"+
-		"\u0001\u0000\u0000\u0000\u00ee\u00ef\u0005!\u0000\u0000\u00ef@\u0001\u0000"+
-		"\u0000\u0000\n\u0000\u00aa\u00b0\u00b9\u00c1\u00c8\u00cd\u00d3\u00da\u00dc"+
-		"\u0001\u0006\u0000\u0000";
+		"\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007"+
+		"!\u0002\"\u0007\"\u0002#\u0007#\u0001\u0000\u0001\u0000\u0001\u0000\u0001"+
+		"\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001"+
+		"\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001"+
+		"\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0001"+
+		"\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001"+
+		"\u0006\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\u0004\u0015\u00cc\b\u0015\u000b\u0015\f\u0015\u00cd\u0001"+
+		"\u0016\u0001\u0016\u0005\u0016\u00d2\b\u0016\n\u0016\f\u0016\u00d5\t\u0016"+
+		"\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0005\u0017\u00db\b\u0017"+
+		"\n\u0017\f\u0017\u00de\t\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0004"+
+		"\u0018\u00e3\b\u0018\u000b\u0018\f\u0018\u00e4\u0001\u0018\u0001\u0018"+
+		"\u0001\u0019\u0004\u0019\u00ea\b\u0019\u000b\u0019\f\u0019\u00eb\u0001"+
+		"\u001a\u0004\u001a\u00ef\b\u001a\u000b\u001a\f\u001a\u00f0\u0001\u001a"+
+		"\u0001\u001a\u0005\u001a\u00f5\b\u001a\n\u001a\f\u001a\u00f8\t\u001a\u0001"+
+		"\u001a\u0001\u001a\u0004\u001a\u00fc\b\u001a\u000b\u001a\f\u001a\u00fd"+
+		"\u0003\u001a\u0100\b\u001a\u0001\u001b\u0001\u001b\u0001\u001c\u0001\u001c"+
+		"\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f\u0001\u001f"+
+		"\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001#\u0001#\u0001\u00dc"+
+		"\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$\u0001\u0000\u0005\u0002\u0000AZaz\u0001\u0000\"\"\u0001\u0000~~\u0003"+
+		"\u0000\t\n\r\r  \u0001\u000009\u011b\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\u0001"+
+		"I\u0001\u0000\u0000\u0000\u0003Q\u0001\u0000\u0000\u0000\u0005S\u0001"+
+		"\u0000\u0000\u0000\u0007Z\u0001\u0000\u0000\u0000\t]\u0001\u0000\u0000"+
+		"\u0000\u000b`\u0001\u0000\u0000\u0000\rc\u0001\u0000\u0000\u0000\u000f"+
+		"j\u0001\u0000\u0000\u0000\u0011m\u0001\u0000\u0000\u0000\u0013v\u0001"+
+		"\u0000\u0000\u0000\u0015\u007f\u0001\u0000\u0000\u0000\u0017\u0083\u0001"+
+		"\u0000\u0000\u0000\u0019\u0089\u0001\u0000\u0000\u0000\u001b\u0090\u0001"+
+		"\u0000\u0000\u0000\u001d\u0097\u0001\u0000\u0000\u0000\u001f\u009f\u0001"+
+		"\u0000\u0000\u0000!\u00a4\u0001\u0000\u0000\u0000#\u00a9\u0001\u0000\u0000"+
+		"\u0000%\u00b0\u0001\u0000\u0000\u0000\'\u00ba\u0001\u0000\u0000\u0000"+
+		")\u00c2\u0001\u0000\u0000\u0000+\u00cb\u0001\u0000\u0000\u0000-\u00cf"+
+		"\u0001\u0000\u0000\u0000/\u00d8\u0001\u0000\u0000\u00001\u00e2\u0001\u0000"+
+		"\u0000\u00003\u00e9\u0001\u0000\u0000\u00005\u00ff\u0001\u0000\u0000\u0000"+
+		"7\u0101\u0001\u0000\u0000\u00009\u0103\u0001\u0000\u0000\u0000;\u0105"+
+		"\u0001\u0000\u0000\u0000=\u0107\u0001\u0000\u0000\u0000?\u0109\u0001\u0000"+
+		"\u0000\u0000A\u010b\u0001\u0000\u0000\u0000C\u010d\u0001\u0000\u0000\u0000"+
+		"E\u010f\u0001\u0000\u0000\u0000G\u0111\u0001\u0000\u0000\u0000IJ\u0005"+
+		"p\u0000\u0000JK\u0005a\u0000\u0000KL\u0005c\u0000\u0000LM\u0005k\u0000"+
+		"\u0000MN\u0005a\u0000\u0000NO\u0005g\u0000\u0000OP\u0005e\u0000\u0000"+
+		"P\u0002\u0001\u0000\u0000\u0000QR\u0005@\u0000\u0000R\u0004\u0001\u0000"+
+		"\u0000\u0000ST\u0005r\u0000\u0000TU\u0005e\u0000\u0000UV\u0005s\u0000"+
+		"\u0000VW\u0005u\u0000\u0000WX\u0005l\u0000\u0000XY\u0005t\u0000\u0000"+
+		"Y\u0006\u0001\u0000\u0000\u0000Z[\u0005=\u0000\u0000[\\\u0005>\u0000\u0000"+
+		"\\\b\u0001\u0000\u0000\u0000]^\u0005&\u0000\u0000^_\u0005&\u0000\u0000"+
+		"_\n\u0001\u0000\u0000\u0000`a\u0005|\u0000\u0000ab\u0005|\u0000\u0000"+
+		"b\f\u0001\u0000\u0000\u0000cd\u0005r\u0000\u0000de\u0005e\u0000\u0000"+
+		"ef\u0005t\u0000\u0000fg\u0005u\u0000\u0000gh\u0005r\u0000\u0000hi\u0005"+
+		"n\u0000\u0000i\u000e\u0001\u0000\u0000\u0000jk\u0005[\u0000\u0000kl\u0005"+
+		"]\u0000\u0000l\u0010\u0001\u0000\u0000\u0000mn\u0005c\u0000\u0000no\u0005"+
+		"r\u0000\u0000op\u0005i\u0000\u0000pq\u0005t\u0000\u0000qr\u0005i\u0000"+
+		"\u0000rs\u0005c\u0000\u0000st\u0005a\u0000\u0000tu\u0005l\u0000\u0000"+
+		"u\u0012\u0001\u0000\u0000\u0000vw\u0005o\u0000\u0000wx\u0005p\u0000\u0000"+
+		"xy\u0005t\u0000\u0000yz\u0005i\u0000\u0000z{\u0005o\u0000\u0000{|\u0005"+
+		"n\u0000\u0000|}\u0005a\u0000\u0000}~\u0005l\u0000\u0000~\u0014\u0001\u0000"+
+		"\u0000\u0000\u007f\u0080\u0005I\u0000\u0000\u0080\u0081\u0005N\u0000\u0000"+
+		"\u0081\u0082\u0005T\u0000\u0000\u0082\u0016\u0001\u0000\u0000\u0000\u0083"+
+		"\u0084\u0005F\u0000\u0000\u0084\u0085\u0005L\u0000\u0000\u0085\u0086\u0005"+
+		"O\u0000\u0000\u0086\u0087\u0005A\u0000\u0000\u0087\u0088\u0005T\u0000"+
+		"\u0000\u0088\u0018\u0001\u0000\u0000\u0000\u0089\u008a\u0005D\u0000\u0000"+
+		"\u008a\u008b\u0005O\u0000\u0000\u008b\u008c\u0005U\u0000\u0000\u008c\u008d"+
+		"\u0005B\u0000\u0000\u008d\u008e\u0005L\u0000\u0000\u008e\u008f\u0005E"+
+		"\u0000\u0000\u008f\u001a\u0001\u0000\u0000\u0000\u0090\u0091\u0005S\u0000"+
+		"\u0000\u0091\u0092\u0005T\u0000\u0000\u0092\u0093\u0005R\u0000\u0000\u0093"+
+		"\u0094\u0005I\u0000\u0000\u0094\u0095\u0005N\u0000\u0000\u0095\u0096\u0005"+
+		"G\u0000\u0000\u0096\u001c\u0001\u0000\u0000\u0000\u0097\u0098\u0005B\u0000"+
+		"\u0000\u0098\u0099\u0005O\u0000\u0000\u0099\u009a\u0005O\u0000\u0000\u009a"+
+		"\u009b\u0005L\u0000\u0000\u009b\u009c\u0005E\u0000\u0000\u009c\u009d\u0005"+
+		"A\u0000\u0000\u009d\u009e\u0005N\u0000\u0000\u009e\u001e\u0001\u0000\u0000"+
+		"\u0000\u009f\u00a0\u0005C\u0000\u0000\u00a0\u00a1\u0005H\u0000\u0000\u00a1"+
+		"\u00a2\u0005A\u0000\u0000\u00a2\u00a3\u0005R\u0000\u0000\u00a3 \u0001"+
+		"\u0000\u0000\u0000\u00a4\u00a5\u0005V\u0000\u0000\u00a5\u00a6\u0005O\u0000"+
+		"\u0000\u00a6\u00a7\u0005I\u0000\u0000\u00a7\u00a8\u0005D\u0000\u0000\u00a8"+
+		"\"\u0001\u0000\u0000\u0000\u00a9\u00aa\u0005p\u0000\u0000\u00aa\u00ab"+
+		"\u0005u\u0000\u0000\u00ab\u00ac\u0005b\u0000\u0000\u00ac\u00ad\u0005l"+
+		"\u0000\u0000\u00ad\u00ae\u0005i\u0000\u0000\u00ae\u00af\u0005c\u0000\u0000"+
+		"\u00af$\u0001\u0000\u0000\u0000\u00b0\u00b1\u0005p\u0000\u0000\u00b1\u00b2"+
+		"\u0005r\u0000\u0000\u00b2\u00b3\u0005o\u0000\u0000\u00b3\u00b4\u0005t"+
+		"\u0000\u0000\u00b4\u00b5\u0005e\u0000\u0000\u00b5\u00b6\u0005c\u0000\u0000"+
+		"\u00b6\u00b7\u0005t\u0000\u0000\u00b7\u00b8\u0005e\u0000\u0000\u00b8\u00b9"+
+		"\u0005d\u0000\u0000\u00b9&\u0001\u0000\u0000\u0000\u00ba\u00bb\u0005p"+
+		"\u0000\u0000\u00bb\u00bc\u0005r\u0000\u0000\u00bc\u00bd\u0005i\u0000\u0000"+
+		"\u00bd\u00be\u0005v\u0000\u0000\u00be\u00bf\u0005a\u0000\u0000\u00bf\u00c0"+
+		"\u0005t\u0000\u0000\u00c0\u00c1\u0005e\u0000\u0000\u00c1(\u0001\u0000"+
+		"\u0000\u0000\u00c2\u00c3\u0005d\u0000\u0000\u00c3\u00c4\u0005e\u0000\u0000"+
+		"\u00c4\u00c5\u0005f\u0000\u0000\u00c5\u00c6\u0005a\u0000\u0000\u00c6\u00c7"+
+		"\u0005u\u0000\u0000\u00c7\u00c8\u0005l\u0000\u0000\u00c8\u00c9\u0005t"+
+		"\u0000\u0000\u00c9*\u0001\u0000\u0000\u0000\u00ca\u00cc\u0007\u0000\u0000"+
+		"\u0000\u00cb\u00ca\u0001\u0000\u0000\u0000\u00cc\u00cd\u0001\u0000\u0000"+
+		"\u0000\u00cd\u00cb\u0001\u0000\u0000\u0000\u00cd\u00ce\u0001\u0000\u0000"+
+		"\u0000\u00ce,\u0001\u0000\u0000\u0000\u00cf\u00d3\u0005\"\u0000\u0000"+
+		"\u00d0\u00d2\b\u0001\u0000\u0000\u00d1\u00d0\u0001\u0000\u0000\u0000\u00d2"+
+		"\u00d5\u0001\u0000\u0000\u0000\u00d3\u00d1\u0001\u0000\u0000\u0000\u00d3"+
+		"\u00d4\u0001\u0000\u0000\u0000\u00d4\u00d6\u0001\u0000\u0000\u0000\u00d5"+
+		"\u00d3\u0001\u0000\u0000\u0000\u00d6\u00d7\u0005\"\u0000\u0000\u00d7."+
+		"\u0001\u0000\u0000\u0000\u00d8\u00dc\u0005~\u0000\u0000\u00d9\u00db\b"+
+		"\u0002\u0000\u0000\u00da\u00d9\u0001\u0000\u0000\u0000\u00db\u00de\u0001"+
+		"\u0000\u0000\u0000\u00dc\u00dd\u0001\u0000\u0000\u0000\u00dc\u00da\u0001"+
+		"\u0000\u0000\u0000\u00dd\u00df\u0001\u0000\u0000\u0000\u00de\u00dc\u0001"+
+		"\u0000\u0000\u0000\u00df\u00e0\u0005~\u0000\u0000\u00e00\u0001\u0000\u0000"+
+		"\u0000\u00e1\u00e3\u0007\u0003\u0000\u0000\u00e2\u00e1\u0001\u0000\u0000"+
+		"\u0000\u00e3\u00e4\u0001\u0000\u0000\u0000\u00e4\u00e2\u0001\u0000\u0000"+
+		"\u0000\u00e4\u00e5\u0001\u0000\u0000\u0000\u00e5\u00e6\u0001\u0000\u0000"+
+		"\u0000\u00e6\u00e7\u0006\u0018\u0000\u0000\u00e72\u0001\u0000\u0000\u0000"+
+		"\u00e8\u00ea\u0007\u0004\u0000\u0000\u00e9\u00e8\u0001\u0000\u0000\u0000"+
+		"\u00ea\u00eb\u0001\u0000\u0000\u0000\u00eb\u00e9\u0001\u0000\u0000\u0000"+
+		"\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec4\u0001\u0000\u0000\u0000\u00ed"+
+		"\u00ef\u0007\u0004\u0000\u0000\u00ee\u00ed\u0001\u0000\u0000\u0000\u00ef"+
+		"\u00f0\u0001\u0000\u0000\u0000\u00f0\u00ee\u0001\u0000\u0000\u0000\u00f0"+
+		"\u00f1\u0001\u0000\u0000\u0000\u00f1\u00f2\u0001\u0000\u0000\u0000\u00f2"+
+		"\u00f6\u0005.\u0000\u0000\u00f3\u00f5\u0007\u0004\u0000\u0000\u00f4\u00f3"+
+		"\u0001\u0000\u0000\u0000\u00f5\u00f8\u0001\u0000\u0000\u0000\u00f6\u00f4"+
+		"\u0001\u0000\u0000\u0000\u00f6\u00f7\u0001\u0000\u0000\u0000\u00f7\u0100"+
+		"\u0001\u0000\u0000\u0000\u00f8\u00f6\u0001\u0000\u0000\u0000\u00f9\u00fb"+
+		"\u0005.\u0000\u0000\u00fa\u00fc\u0007\u0004\u0000\u0000\u00fb\u00fa\u0001"+
+		"\u0000\u0000\u0000\u00fc\u00fd\u0001\u0000\u0000\u0000\u00fd\u00fb\u0001"+
+		"\u0000\u0000\u0000\u00fd\u00fe\u0001\u0000\u0000\u0000\u00fe\u0100\u0001"+
+		"\u0000\u0000\u0000\u00ff\u00ee\u0001\u0000\u0000\u0000\u00ff\u00f9\u0001"+
+		"\u0000\u0000\u0000\u01006\u0001\u0000\u0000\u0000\u0101\u0102\u0005(\u0000"+
+		"\u0000\u01028\u0001\u0000\u0000\u0000\u0103\u0104\u0005)\u0000\u0000\u0104"+
+		":\u0001\u0000\u0000\u0000\u0105\u0106\u0005:\u0000\u0000\u0106<\u0001"+
+		"\u0000\u0000\u0000\u0107\u0108\u0005;\u0000\u0000\u0108>\u0001\u0000\u0000"+
+		"\u0000\u0109\u010a\u0005,\u0000\u0000\u010a@\u0001\u0000\u0000\u0000\u010b"+
+		"\u010c\u0005{\u0000\u0000\u010cB\u0001\u0000\u0000\u0000\u010d\u010e\u0005"+
+		"}\u0000\u0000\u010eD\u0001\u0000\u0000\u0000\u010f\u0110\u0005~\u0000"+
+		"\u0000\u0110F\u0001\u0000\u0000\u0000\u0111\u0112\u0005!\u0000\u0000\u0112"+
+		"H\u0001\u0000\u0000\u0000\n\u0000\u00cd\u00d3\u00dc\u00e4\u00eb\u00f0"+
+		"\u00f6\u00fd\u00ff\u0001\u0006\u0000\u0000";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.tokens b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.tokens
index 1eb4d46..3567d7b 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.tokens
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsLexer.tokens
@@ -15,44 +15,52 @@ T__13=14
 T__14=15
 T__15=16
 T__16=17
-ID=18
-STRING=19
-DESCRIPTION=20
-WS=21
-INT=22
-FLOAT=23
-LPAREN=24
-RPAREN=25
-COLON=26
-SEMICOLON=27
-COMMA=28
-LBRACE=29
-RBRACE=30
-TILDE=31
-EXCLAM=32
-'=>'=1
-'&&'=2
-'||'=3
-'()'=4
-'Access '=5
-'Return'=6
-'INT'=7
-'FLOAT'=8
-'DOUBLE'=9
-'STRING'=10
-'BOOLEAN'=11
-'CHAR'=12
-'VOID'=13
-'PUBLIC'=14
-'PROTECTED'=15
-'PRIVATE'=16
-'DEFAULT'=17
-'('=24
-')'=25
-':'=26
-';'=27
-','=28
-'{'=29
-'}'=30
-'~'=31
-'!'=32
+T__17=18
+T__18=19
+T__19=20
+T__20=21
+ID=22
+STRING=23
+DESCRIPTION=24
+WS=25
+INT=26
+FLOAT=27
+LPAREN=28
+RPAREN=29
+COLON=30
+SEMICOLON=31
+COMMA=32
+LBRACE=33
+RBRACE=34
+TILDE=35
+EXCLAM=36
+'package'=1
+'@'=2
+'result'=3
+'=>'=4
+'&&'=5
+'||'=6
+'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
+'('=28
+')'=29
+':'=30
+';'=31
+','=32
+'{'=33
+'}'=34
+'~'=35
+'!'=36
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsListener.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsListener.java
index b64c0de..aabdcef 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsListener.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsListener.java
@@ -17,6 +17,16 @@ public interface SoftwareRequirementsListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitProgram(SoftwareRequirementsParser.ProgramContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#program_body}.
+	 * @param ctx the parse tree
+	 */
+	void enterProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#program_body}.
+	 * @param ctx the parse tree
+	 */
+	void exitProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#requirementSpec}.
 	 * @param ctx the parse tree
@@ -28,15 +38,25 @@ public interface SoftwareRequirementsListener extends ParseTreeListener {
 	 */
 	void exitRequirementSpec(SoftwareRequirementsParser.RequirementSpecContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#req_specification}.
 	 * @param ctx the parse tree
 	 */
-	void enterDescription(SoftwareRequirementsParser.DescriptionContext ctx);
+	void enterReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#req_specification}.
 	 * @param ctx the parse tree
 	 */
-	void exitDescription(SoftwareRequirementsParser.DescriptionContext ctx);
+	void exitReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#result_specification}.
+	 * @param ctx the parse tree
+	 */
+	void enterResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#result_specification}.
+	 * @param ctx the parse tree
+	 */
+	void exitResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#predicate}.
 	 * @param ctx the parse tree
@@ -88,15 +108,25 @@ public interface SoftwareRequirementsListener extends ParseTreeListener {
 	 */
 	void exitFunctionSpec(SoftwareRequirementsParser.FunctionSpecContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#access_modifier}.
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#functionBody}.
 	 * @param ctx the parse tree
 	 */
-	void enterAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx);
+	void enterFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#access_modifier}.
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#functionBody}.
 	 * @param ctx the parse tree
 	 */
-	void exitAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx);
+	void exitFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#input_types}.
+	 * @param ctx the parse tree
+	 */
+	void enterInput_types(SoftwareRequirementsParser.Input_typesContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#input_types}.
+	 * @param ctx the parse tree
+	 */
+	void exitInput_types(SoftwareRequirementsParser.Input_typesContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#return_types}.
 	 * @param ctx the parse tree
@@ -108,35 +138,35 @@ public interface SoftwareRequirementsListener extends ParseTreeListener {
 	 */
 	void exitReturn_types(SoftwareRequirementsParser.Return_typesContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#return}.
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#specification}.
 	 * @param ctx the parse tree
 	 */
-	void enterReturn(SoftwareRequirementsParser.ReturnContext ctx);
+	void enterSpecification(SoftwareRequirementsParser.SpecificationContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#return}.
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#specification}.
 	 * @param ctx the parse tree
 	 */
-	void exitReturn(SoftwareRequirementsParser.ReturnContext ctx);
+	void exitSpecification(SoftwareRequirementsParser.SpecificationContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#parameter_list}.
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#variable}.
 	 * @param ctx the parse tree
 	 */
-	void enterParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx);
+	void enterVariable(SoftwareRequirementsParser.VariableContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#parameter_list}.
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#variable}.
 	 * @param ctx the parse tree
 	 */
-	void exitParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx);
+	void exitVariable(SoftwareRequirementsParser.VariableContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#parameter}.
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#importance}.
 	 * @param ctx the parse tree
 	 */
-	void enterParameter(SoftwareRequirementsParser.ParameterContext ctx);
+	void enterImportance(SoftwareRequirementsParser.ImportanceContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#parameter}.
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#importance}.
 	 * @param ctx the parse tree
 	 */
-	void exitParameter(SoftwareRequirementsParser.ParameterContext ctx);
+	void exitImportance(SoftwareRequirementsParser.ImportanceContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#type}.
 	 * @param ctx the parse tree
@@ -157,4 +187,14 @@ public interface SoftwareRequirementsListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitAccess_modifiers(SoftwareRequirementsParser.Access_modifiersContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * @param ctx the parse tree
+	 */
+	void enterDescription(SoftwareRequirementsParser.DescriptionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * @param ctx the parse tree
+	 */
+	void exitDescription(SoftwareRequirementsParser.DescriptionContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsParser.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsParser.java
index 6222a54..1c17d16 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsParser.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsParser.java
@@ -19,38 +19,42 @@ public class SoftwareRequirementsParser 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, 
-		ID=18, STRING=19, DESCRIPTION=20, WS=21, INT=22, FLOAT=23, LPAREN=24, 
-		RPAREN=25, COLON=26, SEMICOLON=27, COMMA=28, LBRACE=29, RBRACE=30, TILDE=31, 
-		EXCLAM=32;
+		T__17=18, T__18=19, T__19=20, T__20=21, ID=22, STRING=23, DESCRIPTION=24, 
+		WS=25, INT=26, FLOAT=27, LPAREN=28, RPAREN=29, COLON=30, SEMICOLON=31, 
+		COMMA=32, LBRACE=33, RBRACE=34, TILDE=35, EXCLAM=36;
 	public static final int
-		RULE_program = 0, RULE_requirementSpec = 1, RULE_description = 2, RULE_predicate = 3, 
-		RULE_expression = 4, RULE_term = 5, RULE_logical_op = 6, RULE_functionSpec = 7, 
-		RULE_access_modifier = 8, RULE_return_types = 9, RULE_return = 10, RULE_parameter_list = 11, 
-		RULE_parameter = 12, RULE_type = 13, RULE_access_modifiers = 14;
+		RULE_program = 0, RULE_program_body = 1, RULE_requirementSpec = 2, RULE_req_specification = 3, 
+		RULE_result_specification = 4, RULE_predicate = 5, RULE_expression = 6, 
+		RULE_term = 7, RULE_logical_op = 8, RULE_functionSpec = 9, RULE_functionBody = 10, 
+		RULE_input_types = 11, RULE_return_types = 12, RULE_specification = 13, 
+		RULE_variable = 14, RULE_importance = 15, RULE_type = 16, RULE_access_modifiers = 17, 
+		RULE_description = 18;
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"program", "requirementSpec", "description", "predicate", "expression", 
-			"term", "logical_op", "functionSpec", "access_modifier", "return_types", 
-			"return", "parameter_list", "parameter", "type", "access_modifiers"
+			"program", "program_body", "requirementSpec", "req_specification", "result_specification", 
+			"predicate", "expression", "term", "logical_op", "functionSpec", "functionBody", 
+			"input_types", "return_types", "specification", "variable", "importance", 
+			"type", "access_modifiers", "description"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'=>'", "'&&'", "'||'", "'()'", "'Access '", "'Return'", "'INT'", 
-			"'FLOAT'", "'DOUBLE'", "'STRING'", "'BOOLEAN'", "'CHAR'", "'VOID'", "'PUBLIC'", 
-			"'PROTECTED'", "'PRIVATE'", "'DEFAULT'", null, null, null, null, null, 
-			null, "'('", "')'", "':'", "';'", "','", "'{'", "'}'", "'~'", "'!'"
+			null, "'package'", "'@'", "'result'", "'=>'", "'&&'", "'||'", "'return'", 
+			"'[]'", "'critical'", "'optional'", "'INT'", "'FLOAT'", "'DOUBLE'", "'STRING'", 
+			"'BOOLEAN'", "'CHAR'", "'VOID'", "'public'", "'protected'", "'private'", 
+			"'default'", null, null, null, null, null, null, "'('", "')'", "':'", 
+			"';'", "','", "'{'", "'}'", "'~'", "'!'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
 	private static String[] makeSymbolicNames() {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, "ID", "STRING", "DESCRIPTION", "WS", 
-			"INT", "FLOAT", "LPAREN", "RPAREN", "COLON", "SEMICOLON", "COMMA", "LBRACE", 
-			"RBRACE", "TILDE", "EXCLAM"
+			null, null, null, null, null, null, null, null, null, null, "ID", "STRING", 
+			"DESCRIPTION", "WS", "INT", "FLOAT", "LPAREN", "RPAREN", "COLON", "SEMICOLON", 
+			"COMMA", "LBRACE", "RBRACE", "TILDE", "EXCLAM"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -106,17 +110,14 @@ public class SoftwareRequirementsParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class ProgramContext extends ParserRuleContext {
-		public List<RequirementSpecContext> requirementSpec() {
-			return getRuleContexts(RequirementSpecContext.class);
+		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
+		public TerminalNode LBRACE() { return getToken(SoftwareRequirementsParser.LBRACE, 0); }
+		public Program_bodyContext program_body() {
+			return getRuleContext(Program_bodyContext.class,0);
 		}
-		public RequirementSpecContext requirementSpec(int i) {
-			return getRuleContext(RequirementSpecContext.class,i);
-		}
-		public List<FunctionSpecContext> functionSpec() {
-			return getRuleContexts(FunctionSpecContext.class);
-		}
-		public FunctionSpecContext functionSpec(int i) {
-			return getRuleContext(FunctionSpecContext.class,i);
+		public TerminalNode RBRACE() { return getToken(SoftwareRequirementsParser.RBRACE, 0); }
+		public DescriptionContext description() {
+			return getRuleContext(DescriptionContext.class,0);
 		}
 		public ProgramContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
@@ -144,32 +145,105 @@ public class SoftwareRequirementsParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(32); 
+			setState(39);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==DESCRIPTION) {
+				{
+				setState(38);
+				description();
+				}
+			}
+
+			setState(41);
+			match(T__0);
+			setState(42);
+			match(ID);
+			setState(43);
+			match(LBRACE);
+			setState(44);
+			program_body();
+			setState(45);
+			match(RBRACE);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class Program_bodyContext extends ParserRuleContext {
+		public List<RequirementSpecContext> requirementSpec() {
+			return getRuleContexts(RequirementSpecContext.class);
+		}
+		public RequirementSpecContext requirementSpec(int i) {
+			return getRuleContext(RequirementSpecContext.class,i);
+		}
+		public List<FunctionSpecContext> functionSpec() {
+			return getRuleContexts(FunctionSpecContext.class);
+		}
+		public FunctionSpecContext functionSpec(int i) {
+			return getRuleContext(FunctionSpecContext.class,i);
+		}
+		public Program_bodyContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_program_body; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterProgram_body(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitProgram_body(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitProgram_body(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final Program_bodyContext program_body() throws RecognitionException {
+		Program_bodyContext _localctx = new Program_bodyContext(_ctx, getState());
+		enterRule(_localctx, 2, RULE_program_body);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(49); 
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			do {
 				{
-				setState(32);
+				setState(49);
 				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
+				switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
 				case 1:
 					{
-					setState(30);
+					setState(47);
 					requirementSpec();
 					}
 					break;
 				case 2:
 					{
-					setState(31);
+					setState(48);
 					functionSpec();
 					}
 					break;
 				}
 				}
-				setState(34); 
+				setState(51); 
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-			} while ( _la==ID || _la==EXCLAM );
+			} while ( (((_la) & ~0x3f) == 0 && ((1L << _la) & 24905216L) != 0) );
 			}
 		}
 		catch (RecognitionException re) {
@@ -186,15 +260,26 @@ public class SoftwareRequirementsParser extends Parser {
 	@SuppressWarnings("CheckReturnValue")
 	public static class RequirementSpecContext extends ParserRuleContext {
 		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
-		public PredicateContext predicate() {
-			return getRuleContext(PredicateContext.class,0);
-		}
-		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
-		public TerminalNode EXCLAM() { return getToken(SoftwareRequirementsParser.EXCLAM, 0); }
-		public TerminalNode COLON() { return getToken(SoftwareRequirementsParser.COLON, 0); }
+		public TerminalNode LBRACE() { return getToken(SoftwareRequirementsParser.LBRACE, 0); }
+		public TerminalNode RBRACE() { return getToken(SoftwareRequirementsParser.RBRACE, 0); }
 		public DescriptionContext description() {
 			return getRuleContext(DescriptionContext.class,0);
 		}
+		public ImportanceContext importance() {
+			return getRuleContext(ImportanceContext.class,0);
+		}
+		public List<Req_specificationContext> req_specification() {
+			return getRuleContexts(Req_specificationContext.class);
+		}
+		public Req_specificationContext req_specification(int i) {
+			return getRuleContext(Req_specificationContext.class,i);
+		}
+		public List<Result_specificationContext> result_specification() {
+			return getRuleContexts(Result_specificationContext.class);
+		}
+		public Result_specificationContext result_specification(int i) {
+			return getRuleContext(Result_specificationContext.class,i);
+		}
 		public RequirementSpecContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -216,38 +301,151 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final RequirementSpecContext requirementSpec() throws RecognitionException {
 		RequirementSpecContext _localctx = new RequirementSpecContext(_ctx, getState());
-		enterRule(_localctx, 2, RULE_requirementSpec);
+		enterRule(_localctx, 4, RULE_requirementSpec);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(37);
+			setState(54);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==EXCLAM) {
+			if (_la==DESCRIPTION) {
 				{
-				setState(36);
-				match(EXCLAM);
-				}
-			}
-
-			setState(39);
-			match(ID);
-			setState(42);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==COLON) {
-				{
-				setState(40);
-				match(COLON);
-				setState(41);
+				setState(53);
 				description();
 				}
 			}
 
-			setState(44);
-			predicate();
-			setState(45);
+			setState(57);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__8 || _la==T__9) {
+				{
+				setState(56);
+				importance();
+				}
+			}
+
+			setState(59);
+			match(ID);
+			setState(60);
+			match(LBRACE);
+			setState(64);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 1540L) != 0)) {
+				{
+				{
+				setState(61);
+				req_specification();
+				}
+				}
+				setState(66);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(70);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__2) {
+				{
+				{
+				setState(67);
+				result_specification();
+				}
+				}
+				setState(72);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(73);
+			match(RBRACE);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class Req_specificationContext extends ParserRuleContext {
+		public List<TerminalNode> ID() { return getTokens(SoftwareRequirementsParser.ID); }
+		public TerminalNode ID(int i) {
+			return getToken(SoftwareRequirementsParser.ID, i);
+		}
+		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
+		public ImportanceContext importance() {
+			return getRuleContext(ImportanceContext.class,0);
+		}
+		public List<Logical_opContext> logical_op() {
+			return getRuleContexts(Logical_opContext.class);
+		}
+		public Logical_opContext logical_op(int i) {
+			return getRuleContext(Logical_opContext.class,i);
+		}
+		public Req_specificationContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_req_specification; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterReq_specification(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitReq_specification(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitReq_specification(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final Req_specificationContext req_specification() throws RecognitionException {
+		Req_specificationContext _localctx = new Req_specificationContext(_ctx, getState());
+		enterRule(_localctx, 6, RULE_req_specification);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(76);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__8 || _la==T__9) {
+				{
+				setState(75);
+				importance();
+				}
+			}
+
+			setState(78);
+			match(T__1);
+			setState(79);
+			match(ID);
+			setState(85);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__4 || _la==T__5) {
+				{
+				{
+				setState(80);
+				logical_op();
+				setState(81);
+				match(ID);
+				}
+				}
+				setState(87);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(88);
 			match(SEMICOLON);
 			}
 		}
@@ -263,35 +461,54 @@ public class SoftwareRequirementsParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class DescriptionContext extends ParserRuleContext {
-		public TerminalNode DESCRIPTION() { return getToken(SoftwareRequirementsParser.DESCRIPTION, 0); }
-		public DescriptionContext(ParserRuleContext parent, int invokingState) {
+	public static class Result_specificationContext extends ParserRuleContext {
+		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
+		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
+		public ImportanceContext importance() {
+			return getRuleContext(ImportanceContext.class,0);
+		}
+		public Result_specificationContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_description; }
+		@Override public int getRuleIndex() { return RULE_result_specification; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterDescription(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterResult_specification(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitDescription(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitResult_specification(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitDescription(this);
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitResult_specification(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final DescriptionContext description() throws RecognitionException {
-		DescriptionContext _localctx = new DescriptionContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_description);
+	public final Result_specificationContext result_specification() throws RecognitionException {
+		Result_specificationContext _localctx = new Result_specificationContext(_ctx, getState());
+		enterRule(_localctx, 8, RULE_result_specification);
+		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(47);
-			match(DESCRIPTION);
+			setState(90);
+			match(T__2);
+			setState(92);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__8 || _la==T__9) {
+				{
+				setState(91);
+				importance();
+				}
+			}
+
+			setState(94);
+			match(ID);
+			setState(95);
+			match(SEMICOLON);
 			}
 		}
 		catch (RecognitionException re) {
@@ -334,15 +551,15 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final PredicateContext predicate() throws RecognitionException {
 		PredicateContext _localctx = new PredicateContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_predicate);
+		enterRule(_localctx, 10, RULE_predicate);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(49);
+			setState(97);
 			expression();
-			setState(50);
-			match(T__0);
-			setState(51);
+			setState(98);
+			match(T__3);
+			setState(99);
 			expression();
 			}
 		}
@@ -392,26 +609,26 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final ExpressionContext expression() throws RecognitionException {
 		ExpressionContext _localctx = new ExpressionContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_expression);
+		enterRule(_localctx, 12, RULE_expression);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(53);
+			setState(101);
 			term();
-			setState(59);
+			setState(107);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__1 || _la==T__2) {
+			while (_la==T__4 || _la==T__5) {
 				{
 				{
-				setState(54);
+				setState(102);
 				logical_op();
-				setState(55);
+				setState(103);
 				term();
 				}
 				}
-				setState(61);
+				setState(109);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -457,26 +674,26 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final TermContext term() throws RecognitionException {
 		TermContext _localctx = new TermContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_term);
+		enterRule(_localctx, 14, RULE_term);
 		try {
-			setState(67);
+			setState(115);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case LBRACE:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(62);
+				setState(110);
 				match(LBRACE);
-				setState(63);
+				setState(111);
 				expression();
-				setState(64);
+				setState(112);
 				match(RBRACE);
 				}
 				break;
 			case STRING:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(66);
+				setState(114);
 				match(STRING);
 				}
 				break;
@@ -518,14 +735,14 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final Logical_opContext logical_op() throws RecognitionException {
 		Logical_opContext _localctx = new Logical_opContext(_ctx, getState());
-		enterRule(_localctx, 12, RULE_logical_op);
+		enterRule(_localctx, 16, RULE_logical_op);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(69);
+			setState(117);
 			_la = _input.LA(1);
-			if ( !(_la==T__1 || _la==T__2) ) {
+			if ( !(_la==T__4 || _la==T__5) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -549,22 +766,22 @@ public class SoftwareRequirementsParser extends Parser {
 	@SuppressWarnings("CheckReturnValue")
 	public static class FunctionSpecContext extends ParserRuleContext {
 		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
-		public TerminalNode COLON() { return getToken(SoftwareRequirementsParser.COLON, 0); }
-		public Return_typesContext return_types() {
-			return getRuleContext(Return_typesContext.class,0);
+		public TerminalNode LPAREN() { return getToken(SoftwareRequirementsParser.LPAREN, 0); }
+		public TerminalNode RPAREN() { return getToken(SoftwareRequirementsParser.RPAREN, 0); }
+		public FunctionBodyContext functionBody() {
+			return getRuleContext(FunctionBodyContext.class,0);
 		}
-		public TerminalNode LBRACE() { return getToken(SoftwareRequirementsParser.LBRACE, 0); }
-		public Parameter_listContext parameter_list() {
-			return getRuleContext(Parameter_listContext.class,0);
-		}
-		public TerminalNode RBRACE() { return getToken(SoftwareRequirementsParser.RBRACE, 0); }
-		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
-		public TerminalNode EXCLAM() { return getToken(SoftwareRequirementsParser.EXCLAM, 0); }
 		public DescriptionContext description() {
 			return getRuleContext(DescriptionContext.class,0);
 		}
-		public Access_modifierContext access_modifier() {
-			return getRuleContext(Access_modifierContext.class,0);
+		public ImportanceContext importance() {
+			return getRuleContext(ImportanceContext.class,0);
+		}
+		public Access_modifiersContext access_modifiers() {
+			return getRuleContext(Access_modifiersContext.class,0);
+		}
+		public Input_typesContext input_types() {
+			return getRuleContext(Input_typesContext.class,0);
 		}
 		public FunctionSpecContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
@@ -587,57 +804,59 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final FunctionSpecContext functionSpec() throws RecognitionException {
 		FunctionSpecContext _localctx = new FunctionSpecContext(_ctx, getState());
-		enterRule(_localctx, 14, RULE_functionSpec);
+		enterRule(_localctx, 18, RULE_functionSpec);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(72);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==EXCLAM) {
-				{
-				setState(71);
-				match(EXCLAM);
-				}
-			}
-
-			setState(74);
-			match(ID);
-			setState(75);
-			match(T__3);
-			setState(76);
-			match(COLON);
-			setState(78);
+			setState(120);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==DESCRIPTION) {
 				{
-				setState(77);
+				setState(119);
 				description();
 				}
 			}
 
-			setState(81);
+			setState(123);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if (_la==T__4) {
+			if (_la==T__8 || _la==T__9) {
 				{
-				setState(80);
-				access_modifier();
+				setState(122);
+				importance();
 				}
 			}
 
-			setState(83);
-			return_types();
-			setState(84);
-			match(LBRACE);
-			setState(85);
-			parameter_list();
-			setState(86);
-			match(RBRACE);
-			setState(87);
-			match(SEMICOLON);
+			setState(126);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 3932160L) != 0)) {
+				{
+				setState(125);
+				access_modifiers();
+				}
+			}
+
+			setState(128);
+			match(ID);
+			setState(129);
+			match(LPAREN);
+			setState(131);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 260096L) != 0)) {
+				{
+				setState(130);
+				input_types();
+				}
+			}
+
+			setState(133);
+			match(RPAREN);
+			setState(134);
+			functionBody();
 			}
 		}
 		catch (RecognitionException re) {
@@ -652,42 +871,133 @@ public class SoftwareRequirementsParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class Access_modifierContext extends ParserRuleContext {
-		public Access_modifiersContext access_modifiers() {
-			return getRuleContext(Access_modifiersContext.class,0);
+	public static class FunctionBodyContext extends ParserRuleContext {
+		public TerminalNode LBRACE() { return getToken(SoftwareRequirementsParser.LBRACE, 0); }
+		public Return_typesContext return_types() {
+			return getRuleContext(Return_typesContext.class,0);
 		}
-		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
-		public Access_modifierContext(ParserRuleContext parent, int invokingState) {
+		public TerminalNode RBRACE() { return getToken(SoftwareRequirementsParser.RBRACE, 0); }
+		public List<SpecificationContext> specification() {
+			return getRuleContexts(SpecificationContext.class);
+		}
+		public SpecificationContext specification(int i) {
+			return getRuleContext(SpecificationContext.class,i);
+		}
+		public FunctionBodyContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_access_modifier; }
+		@Override public int getRuleIndex() { return RULE_functionBody; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterAccess_modifier(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterFunctionBody(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitAccess_modifier(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitFunctionBody(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitAccess_modifier(this);
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitFunctionBody(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final Access_modifierContext access_modifier() throws RecognitionException {
-		Access_modifierContext _localctx = new Access_modifierContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_access_modifier);
+	public final FunctionBodyContext functionBody() throws RecognitionException {
+		FunctionBodyContext _localctx = new FunctionBodyContext(_ctx, getState());
+		enterRule(_localctx, 20, RULE_functionBody);
+		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(89);
-			match(T__4);
-			setState(90);
-			access_modifiers();
-			setState(91);
-			match(SEMICOLON);
+			setState(136);
+			match(LBRACE);
+			setState(140);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==T__1) {
+				{
+				{
+				setState(137);
+				specification();
+				}
+				}
+				setState(142);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
+			setState(143);
+			return_types();
+			setState(144);
+			match(RBRACE);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class Input_typesContext extends ParserRuleContext {
+		public List<VariableContext> variable() {
+			return getRuleContexts(VariableContext.class);
+		}
+		public VariableContext variable(int i) {
+			return getRuleContext(VariableContext.class,i);
+		}
+		public List<TerminalNode> COMMA() { return getTokens(SoftwareRequirementsParser.COMMA); }
+		public TerminalNode COMMA(int i) {
+			return getToken(SoftwareRequirementsParser.COMMA, i);
+		}
+		public Input_typesContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_input_types; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterInput_types(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitInput_types(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitInput_types(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final Input_typesContext input_types() throws RecognitionException {
+		Input_typesContext _localctx = new Input_typesContext(_ctx, getState());
+		enterRule(_localctx, 22, RULE_input_types);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(146);
+			variable();
+			setState(151);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while (_la==COMMA) {
+				{
+				{
+				setState(147);
+				match(COMMA);
+				setState(148);
+				variable();
+				}
+				}
+				setState(153);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -703,14 +1013,12 @@ public class SoftwareRequirementsParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class Return_typesContext extends ParserRuleContext {
-		public TerminalNode LPAREN() { return getToken(SoftwareRequirementsParser.LPAREN, 0); }
-		public List<ReturnContext> return_() {
-			return getRuleContexts(ReturnContext.class);
+		public List<VariableContext> variable() {
+			return getRuleContexts(VariableContext.class);
 		}
-		public ReturnContext return_(int i) {
-			return getRuleContext(ReturnContext.class,i);
+		public VariableContext variable(int i) {
+			return getRuleContext(VariableContext.class,i);
 		}
-		public TerminalNode RPAREN() { return getToken(SoftwareRequirementsParser.RPAREN, 0); }
 		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
 		public List<TerminalNode> COMMA() { return getTokens(SoftwareRequirementsParser.COMMA); }
 		public TerminalNode COMMA(int i) {
@@ -737,36 +1045,32 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final Return_typesContext return_types() throws RecognitionException {
 		Return_typesContext _localctx = new Return_typesContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_return_types);
+		enterRule(_localctx, 24, RULE_return_types);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(93);
-			match(T__5);
-			setState(94);
-			match(LPAREN);
-			setState(95);
-			return_();
-			setState(100);
+			setState(154);
+			match(T__6);
+			setState(155);
+			variable();
+			setState(160);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==COMMA) {
 				{
 				{
-				setState(96);
+				setState(156);
 				match(COMMA);
-				setState(97);
-				return_();
+				setState(157);
+				variable();
 				}
 				}
-				setState(102);
+				setState(162);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(103);
-			match(RPAREN);
-			setState(104);
+			setState(163);
 			match(SEMICOLON);
 			}
 		}
@@ -782,39 +1086,104 @@ public class SoftwareRequirementsParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class ReturnContext extends ParserRuleContext {
-		public TypeContext type() {
-			return getRuleContext(TypeContext.class,0);
-		}
+	public static class SpecificationContext extends ParserRuleContext {
 		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
-		public ReturnContext(ParserRuleContext parent, int invokingState) {
+		public TerminalNode COLON() { return getToken(SoftwareRequirementsParser.COLON, 0); }
+		public TerminalNode STRING() { return getToken(SoftwareRequirementsParser.STRING, 0); }
+		public TerminalNode SEMICOLON() { return getToken(SoftwareRequirementsParser.SEMICOLON, 0); }
+		public SpecificationContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_return; }
+		@Override public int getRuleIndex() { return RULE_specification; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterReturn(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterSpecification(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitReturn(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitSpecification(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitReturn(this);
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitSpecification(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final ReturnContext return_() throws RecognitionException {
-		ReturnContext _localctx = new ReturnContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_return);
+	public final SpecificationContext specification() throws RecognitionException {
+		SpecificationContext _localctx = new SpecificationContext(_ctx, getState());
+		enterRule(_localctx, 26, RULE_specification);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(106);
+			setState(165);
+			match(T__1);
+			setState(166);
+			match(ID);
+			setState(167);
+			match(COLON);
+			setState(168);
+			match(STRING);
+			setState(169);
+			match(SEMICOLON);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class VariableContext extends ParserRuleContext {
+		public TypeContext type() {
+			return getRuleContext(TypeContext.class,0);
+		}
+		public TerminalNode ID() { return getToken(SoftwareRequirementsParser.ID, 0); }
+		public VariableContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_variable; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterVariable(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitVariable(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitVariable(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final VariableContext variable() throws RecognitionException {
+		VariableContext _localctx = new VariableContext(_ctx, getState());
+		enterRule(_localctx, 28, RULE_variable);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(171);
 			type();
-			setState(107);
+			setState(173);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__7) {
+				{
+				setState(172);
+				match(T__7);
+				}
+			}
+
+			setState(175);
 			match(ID);
 			}
 		}
@@ -830,116 +1199,36 @@ public class SoftwareRequirementsParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class Parameter_listContext extends ParserRuleContext {
-		public List<ParameterContext> parameter() {
-			return getRuleContexts(ParameterContext.class);
-		}
-		public ParameterContext parameter(int i) {
-			return getRuleContext(ParameterContext.class,i);
-		}
-		public List<TerminalNode> COMMA() { return getTokens(SoftwareRequirementsParser.COMMA); }
-		public TerminalNode COMMA(int i) {
-			return getToken(SoftwareRequirementsParser.COMMA, i);
-		}
-		public Parameter_listContext(ParserRuleContext parent, int invokingState) {
+	public static class ImportanceContext extends ParserRuleContext {
+		public ImportanceContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_parameter_list; }
+		@Override public int getRuleIndex() { return RULE_importance; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterParameter_list(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterImportance(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitParameter_list(this);
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitImportance(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitParameter_list(this);
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitImportance(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final Parameter_listContext parameter_list() throws RecognitionException {
-		Parameter_listContext _localctx = new Parameter_listContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_parameter_list);
+	public final ImportanceContext importance() throws RecognitionException {
+		ImportanceContext _localctx = new ImportanceContext(_ctx, getState());
+		enterRule(_localctx, 30, RULE_importance);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(109);
-			parameter();
-			setState(114);
-			_errHandler.sync(this);
+			setState(177);
 			_la = _input.LA(1);
-			while (_la==COMMA) {
-				{
-				{
-				setState(110);
-				match(COMMA);
-				setState(111);
-				parameter();
-				}
-				}
-				setState(116);
-				_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 ParameterContext extends ParserRuleContext {
-		public List<TerminalNode> STRING() { return getTokens(SoftwareRequirementsParser.STRING); }
-		public TerminalNode STRING(int i) {
-			return getToken(SoftwareRequirementsParser.STRING, i);
-		}
-		public TerminalNode COLON() { return getToken(SoftwareRequirementsParser.COLON, 0); }
-		public TerminalNode INT() { return getToken(SoftwareRequirementsParser.INT, 0); }
-		public TerminalNode FLOAT() { return getToken(SoftwareRequirementsParser.FLOAT, 0); }
-		public ParameterContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_parameter; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterParameter(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitParameter(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitParameter(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ParameterContext parameter() throws RecognitionException {
-		ParameterContext _localctx = new ParameterContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_parameter);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(117);
-			match(STRING);
-			setState(118);
-			match(COLON);
-			setState(119);
-			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 13107200L) != 0)) ) {
+			if ( !(_la==T__8 || _la==T__9) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -983,14 +1272,14 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final TypeContext type() throws RecognitionException {
 		TypeContext _localctx = new TypeContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_type);
+		enterRule(_localctx, 32, RULE_type);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(121);
+			setState(179);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 16256L) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 260096L) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1034,14 +1323,14 @@ public class SoftwareRequirementsParser extends Parser {
 
 	public final Access_modifiersContext access_modifiers() throws RecognitionException {
 		Access_modifiersContext _localctx = new Access_modifiersContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_access_modifiers);
+		enterRule(_localctx, 34, RULE_access_modifiers);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(123);
+			setState(181);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 245760L) != 0)) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 3932160L) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1062,74 +1351,158 @@ public class SoftwareRequirementsParser extends Parser {
 		return _localctx;
 	}
 
+	@SuppressWarnings("CheckReturnValue")
+	public static class DescriptionContext extends ParserRuleContext {
+		public TerminalNode DESCRIPTION() { return getToken(SoftwareRequirementsParser.DESCRIPTION, 0); }
+		public DescriptionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_description; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).enterDescription(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SoftwareRequirementsListener ) ((SoftwareRequirementsListener)listener).exitDescription(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SoftwareRequirementsVisitor ) return ((SoftwareRequirementsVisitor<? extends T>)visitor).visitDescription(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final DescriptionContext description() throws RecognitionException {
+		DescriptionContext _localctx = new DescriptionContext(_ctx, getState());
+		enterRule(_localctx, 36, RULE_description);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(183);
+			match(DESCRIPTION);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	public static final String _serializedATN =
-		"\u0004\u0001 ~\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\u0001\u0000\u0001\u0000\u0004"+
-		"\u0000!\b\u0000\u000b\u0000\f\u0000\"\u0001\u0001\u0003\u0001&\b\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u0001+\b\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003"+
-		"\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+
-		"\u0005\u0004:\b\u0004\n\u0004\f\u0004=\t\u0004\u0001\u0005\u0001\u0005"+
-		"\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005D\b\u0005\u0001\u0006"+
-		"\u0001\u0006\u0001\u0007\u0003\u0007I\b\u0007\u0001\u0007\u0001\u0007"+
-		"\u0001\u0007\u0001\u0007\u0003\u0007O\b\u0007\u0001\u0007\u0003\u0007"+
-		"R\b\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+
-		"\u0001\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001"+
-		"\t\u0001\t\u0005\tc\b\t\n\t\f\tf\t\t\u0001\t\u0001\t\u0001\t\u0001\n\u0001"+
-		"\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0005\u000bq\b\u000b\n"+
-		"\u000b\f\u000bt\t\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001"+
-		"\r\u0001\u000e\u0001\u000e\u0001\u000e\u0000\u0000\u000f\u0000\u0002\u0004"+
-		"\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u0000\u0004"+
-		"\u0001\u0000\u0002\u0003\u0002\u0000\u0013\u0013\u0016\u0017\u0001\u0000"+
-		"\u0007\r\u0001\u0000\u000e\u0011y\u0000 \u0001\u0000\u0000\u0000\u0002"+
-		"%\u0001\u0000\u0000\u0000\u0004/\u0001\u0000\u0000\u0000\u00061\u0001"+
-		"\u0000\u0000\u0000\b5\u0001\u0000\u0000\u0000\nC\u0001\u0000\u0000\u0000"+
-		"\fE\u0001\u0000\u0000\u0000\u000eH\u0001\u0000\u0000\u0000\u0010Y\u0001"+
-		"\u0000\u0000\u0000\u0012]\u0001\u0000\u0000\u0000\u0014j\u0001\u0000\u0000"+
-		"\u0000\u0016m\u0001\u0000\u0000\u0000\u0018u\u0001\u0000\u0000\u0000\u001a"+
-		"y\u0001\u0000\u0000\u0000\u001c{\u0001\u0000\u0000\u0000\u001e!\u0003"+
-		"\u0002\u0001\u0000\u001f!\u0003\u000e\u0007\u0000 \u001e\u0001\u0000\u0000"+
-		"\u0000 \u001f\u0001\u0000\u0000\u0000!\"\u0001\u0000\u0000\u0000\" \u0001"+
-		"\u0000\u0000\u0000\"#\u0001\u0000\u0000\u0000#\u0001\u0001\u0000\u0000"+
-		"\u0000$&\u0005 \u0000\u0000%$\u0001\u0000\u0000\u0000%&\u0001\u0000\u0000"+
-		"\u0000&\'\u0001\u0000\u0000\u0000\'*\u0005\u0012\u0000\u0000()\u0005\u001a"+
-		"\u0000\u0000)+\u0003\u0004\u0002\u0000*(\u0001\u0000\u0000\u0000*+\u0001"+
-		"\u0000\u0000\u0000+,\u0001\u0000\u0000\u0000,-\u0003\u0006\u0003\u0000"+
-		"-.\u0005\u001b\u0000\u0000.\u0003\u0001\u0000\u0000\u0000/0\u0005\u0014"+
-		"\u0000\u00000\u0005\u0001\u0000\u0000\u000012\u0003\b\u0004\u000023\u0005"+
-		"\u0001\u0000\u000034\u0003\b\u0004\u00004\u0007\u0001\u0000\u0000\u0000"+
-		"5;\u0003\n\u0005\u000067\u0003\f\u0006\u000078\u0003\n\u0005\u00008:\u0001"+
-		"\u0000\u0000\u000096\u0001\u0000\u0000\u0000:=\u0001\u0000\u0000\u0000"+
-		";9\u0001\u0000\u0000\u0000;<\u0001\u0000\u0000\u0000<\t\u0001\u0000\u0000"+
-		"\u0000=;\u0001\u0000\u0000\u0000>?\u0005\u001d\u0000\u0000?@\u0003\b\u0004"+
-		"\u0000@A\u0005\u001e\u0000\u0000AD\u0001\u0000\u0000\u0000BD\u0005\u0013"+
-		"\u0000\u0000C>\u0001\u0000\u0000\u0000CB\u0001\u0000\u0000\u0000D\u000b"+
-		"\u0001\u0000\u0000\u0000EF\u0007\u0000\u0000\u0000F\r\u0001\u0000\u0000"+
-		"\u0000GI\u0005 \u0000\u0000HG\u0001\u0000\u0000\u0000HI\u0001\u0000\u0000"+
-		"\u0000IJ\u0001\u0000\u0000\u0000JK\u0005\u0012\u0000\u0000KL\u0005\u0004"+
-		"\u0000\u0000LN\u0005\u001a\u0000\u0000MO\u0003\u0004\u0002\u0000NM\u0001"+
-		"\u0000\u0000\u0000NO\u0001\u0000\u0000\u0000OQ\u0001\u0000\u0000\u0000"+
-		"PR\u0003\u0010\b\u0000QP\u0001\u0000\u0000\u0000QR\u0001\u0000\u0000\u0000"+
-		"RS\u0001\u0000\u0000\u0000ST\u0003\u0012\t\u0000TU\u0005\u001d\u0000\u0000"+
-		"UV\u0003\u0016\u000b\u0000VW\u0005\u001e\u0000\u0000WX\u0005\u001b\u0000"+
-		"\u0000X\u000f\u0001\u0000\u0000\u0000YZ\u0005\u0005\u0000\u0000Z[\u0003"+
-		"\u001c\u000e\u0000[\\\u0005\u001b\u0000\u0000\\\u0011\u0001\u0000\u0000"+
-		"\u0000]^\u0005\u0006\u0000\u0000^_\u0005\u0018\u0000\u0000_d\u0003\u0014"+
-		"\n\u0000`a\u0005\u001c\u0000\u0000ac\u0003\u0014\n\u0000b`\u0001\u0000"+
-		"\u0000\u0000cf\u0001\u0000\u0000\u0000db\u0001\u0000\u0000\u0000de\u0001"+
-		"\u0000\u0000\u0000eg\u0001\u0000\u0000\u0000fd\u0001\u0000\u0000\u0000"+
-		"gh\u0005\u0019\u0000\u0000hi\u0005\u001b\u0000\u0000i\u0013\u0001\u0000"+
-		"\u0000\u0000jk\u0003\u001a\r\u0000kl\u0005\u0012\u0000\u0000l\u0015\u0001"+
-		"\u0000\u0000\u0000mr\u0003\u0018\f\u0000no\u0005\u001c\u0000\u0000oq\u0003"+
-		"\u0018\f\u0000pn\u0001\u0000\u0000\u0000qt\u0001\u0000\u0000\u0000rp\u0001"+
-		"\u0000\u0000\u0000rs\u0001\u0000\u0000\u0000s\u0017\u0001\u0000\u0000"+
-		"\u0000tr\u0001\u0000\u0000\u0000uv\u0005\u0013\u0000\u0000vw\u0005\u001a"+
-		"\u0000\u0000wx\u0007\u0001\u0000\u0000x\u0019\u0001\u0000\u0000\u0000"+
-		"yz\u0007\u0002\u0000\u0000z\u001b\u0001\u0000\u0000\u0000{|\u0007\u0003"+
-		"\u0000\u0000|\u001d\u0001\u0000\u0000\u0000\u000b \"%*;CHNQdr";
+		"\u0004\u0001$\u00ba\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"+
+		"\u0001\u0000\u0003\u0000(\b\u0000\u0001\u0000\u0001\u0000\u0001\u0000"+
+		"\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0004\u0001"+
+		"2\b\u0001\u000b\u0001\f\u00013\u0001\u0002\u0003\u00027\b\u0002\u0001"+
+		"\u0002\u0003\u0002:\b\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0005"+
+		"\u0002?\b\u0002\n\u0002\f\u0002B\t\u0002\u0001\u0002\u0005\u0002E\b\u0002"+
+		"\n\u0002\f\u0002H\t\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0003\u0003"+
+		"M\b\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+
+		"\u0005\u0003T\b\u0003\n\u0003\f\u0003W\t\u0003\u0001\u0003\u0001\u0003"+
+		"\u0001\u0004\u0001\u0004\u0003\u0004]\b\u0004\u0001\u0004\u0001\u0004"+
+		"\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0005\u0006j\b\u0006\n\u0006\f\u0006"+
+		"m\t\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+
+		"\u0003\u0007t\b\u0007\u0001\b\u0001\b\u0001\t\u0003\ty\b\t\u0001\t\u0003"+
+		"\t|\b\t\u0001\t\u0003\t\u007f\b\t\u0001\t\u0001\t\u0001\t\u0003\t\u0084"+
+		"\b\t\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0005\n\u008b\b\n\n\n\f\n"+
+		"\u008e\t\n\u0001\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b"+
+		"\u0005\u000b\u0096\b\u000b\n\u000b\f\u000b\u0099\t\u000b\u0001\f\u0001"+
+		"\f\u0001\f\u0001\f\u0005\f\u009f\b\f\n\f\f\f\u00a2\t\f\u0001\f\u0001\f"+
+		"\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e"+
+		"\u0003\u000e\u00ae\b\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f"+
+		"\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012"+
+		"\u0001\u0012\u0000\u0000\u0013\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010"+
+		"\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$\u0000\u0004\u0001\u0000"+
+		"\u0005\u0006\u0001\u0000\t\n\u0001\u0000\u000b\u0011\u0001\u0000\u0012"+
+		"\u0015\u00ba\u0000\'\u0001\u0000\u0000\u0000\u00021\u0001\u0000\u0000"+
+		"\u0000\u00046\u0001\u0000\u0000\u0000\u0006L\u0001\u0000\u0000\u0000\b"+
+		"Z\u0001\u0000\u0000\u0000\na\u0001\u0000\u0000\u0000\fe\u0001\u0000\u0000"+
+		"\u0000\u000es\u0001\u0000\u0000\u0000\u0010u\u0001\u0000\u0000\u0000\u0012"+
+		"x\u0001\u0000\u0000\u0000\u0014\u0088\u0001\u0000\u0000\u0000\u0016\u0092"+
+		"\u0001\u0000\u0000\u0000\u0018\u009a\u0001\u0000\u0000\u0000\u001a\u00a5"+
+		"\u0001\u0000\u0000\u0000\u001c\u00ab\u0001\u0000\u0000\u0000\u001e\u00b1"+
+		"\u0001\u0000\u0000\u0000 \u00b3\u0001\u0000\u0000\u0000\"\u00b5\u0001"+
+		"\u0000\u0000\u0000$\u00b7\u0001\u0000\u0000\u0000&(\u0003$\u0012\u0000"+
+		"\'&\u0001\u0000\u0000\u0000\'(\u0001\u0000\u0000\u0000()\u0001\u0000\u0000"+
+		"\u0000)*\u0005\u0001\u0000\u0000*+\u0005\u0016\u0000\u0000+,\u0005!\u0000"+
+		"\u0000,-\u0003\u0002\u0001\u0000-.\u0005\"\u0000\u0000.\u0001\u0001\u0000"+
+		"\u0000\u0000/2\u0003\u0004\u0002\u000002\u0003\u0012\t\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"+
+		"\u000057\u0003$\u0012\u000065\u0001\u0000\u0000\u000067\u0001\u0000\u0000"+
+		"\u000079\u0001\u0000\u0000\u00008:\u0003\u001e\u000f\u000098\u0001\u0000"+
+		"\u0000\u00009:\u0001\u0000\u0000\u0000:;\u0001\u0000\u0000\u0000;<\u0005"+
+		"\u0016\u0000\u0000<@\u0005!\u0000\u0000=?\u0003\u0006\u0003\u0000>=\u0001"+
+		"\u0000\u0000\u0000?B\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000"+
+		"@A\u0001\u0000\u0000\u0000AF\u0001\u0000\u0000\u0000B@\u0001\u0000\u0000"+
+		"\u0000CE\u0003\b\u0004\u0000DC\u0001\u0000\u0000\u0000EH\u0001\u0000\u0000"+
+		"\u0000FD\u0001\u0000\u0000\u0000FG\u0001\u0000\u0000\u0000GI\u0001\u0000"+
+		"\u0000\u0000HF\u0001\u0000\u0000\u0000IJ\u0005\"\u0000\u0000J\u0005\u0001"+
+		"\u0000\u0000\u0000KM\u0003\u001e\u000f\u0000LK\u0001\u0000\u0000\u0000"+
+		"LM\u0001\u0000\u0000\u0000MN\u0001\u0000\u0000\u0000NO\u0005\u0002\u0000"+
+		"\u0000OU\u0005\u0016\u0000\u0000PQ\u0003\u0010\b\u0000QR\u0005\u0016\u0000"+
+		"\u0000RT\u0001\u0000\u0000\u0000SP\u0001\u0000\u0000\u0000TW\u0001\u0000"+
+		"\u0000\u0000US\u0001\u0000\u0000\u0000UV\u0001\u0000\u0000\u0000VX\u0001"+
+		"\u0000\u0000\u0000WU\u0001\u0000\u0000\u0000XY\u0005\u001f\u0000\u0000"+
+		"Y\u0007\u0001\u0000\u0000\u0000Z\\\u0005\u0003\u0000\u0000[]\u0003\u001e"+
+		"\u000f\u0000\\[\u0001\u0000\u0000\u0000\\]\u0001\u0000\u0000\u0000]^\u0001"+
+		"\u0000\u0000\u0000^_\u0005\u0016\u0000\u0000_`\u0005\u001f\u0000\u0000"+
+		"`\t\u0001\u0000\u0000\u0000ab\u0003\f\u0006\u0000bc\u0005\u0004\u0000"+
+		"\u0000cd\u0003\f\u0006\u0000d\u000b\u0001\u0000\u0000\u0000ek\u0003\u000e"+
+		"\u0007\u0000fg\u0003\u0010\b\u0000gh\u0003\u000e\u0007\u0000hj\u0001\u0000"+
+		"\u0000\u0000if\u0001\u0000\u0000\u0000jm\u0001\u0000\u0000\u0000ki\u0001"+
+		"\u0000\u0000\u0000kl\u0001\u0000\u0000\u0000l\r\u0001\u0000\u0000\u0000"+
+		"mk\u0001\u0000\u0000\u0000no\u0005!\u0000\u0000op\u0003\f\u0006\u0000"+
+		"pq\u0005\"\u0000\u0000qt\u0001\u0000\u0000\u0000rt\u0005\u0017\u0000\u0000"+
+		"sn\u0001\u0000\u0000\u0000sr\u0001\u0000\u0000\u0000t\u000f\u0001\u0000"+
+		"\u0000\u0000uv\u0007\u0000\u0000\u0000v\u0011\u0001\u0000\u0000\u0000"+
+		"wy\u0003$\u0012\u0000xw\u0001\u0000\u0000\u0000xy\u0001\u0000\u0000\u0000"+
+		"y{\u0001\u0000\u0000\u0000z|\u0003\u001e\u000f\u0000{z\u0001\u0000\u0000"+
+		"\u0000{|\u0001\u0000\u0000\u0000|~\u0001\u0000\u0000\u0000}\u007f\u0003"+
+		"\"\u0011\u0000~}\u0001\u0000\u0000\u0000~\u007f\u0001\u0000\u0000\u0000"+
+		"\u007f\u0080\u0001\u0000\u0000\u0000\u0080\u0081\u0005\u0016\u0000\u0000"+
+		"\u0081\u0083\u0005\u001c\u0000\u0000\u0082\u0084\u0003\u0016\u000b\u0000"+
+		"\u0083\u0082\u0001\u0000\u0000\u0000\u0083\u0084\u0001\u0000\u0000\u0000"+
+		"\u0084\u0085\u0001\u0000\u0000\u0000\u0085\u0086\u0005\u001d\u0000\u0000"+
+		"\u0086\u0087\u0003\u0014\n\u0000\u0087\u0013\u0001\u0000\u0000\u0000\u0088"+
+		"\u008c\u0005!\u0000\u0000\u0089\u008b\u0003\u001a\r\u0000\u008a\u0089"+
+		"\u0001\u0000\u0000\u0000\u008b\u008e\u0001\u0000\u0000\u0000\u008c\u008a"+
+		"\u0001\u0000\u0000\u0000\u008c\u008d\u0001\u0000\u0000\u0000\u008d\u008f"+
+		"\u0001\u0000\u0000\u0000\u008e\u008c\u0001\u0000\u0000\u0000\u008f\u0090"+
+		"\u0003\u0018\f\u0000\u0090\u0091\u0005\"\u0000\u0000\u0091\u0015\u0001"+
+		"\u0000\u0000\u0000\u0092\u0097\u0003\u001c\u000e\u0000\u0093\u0094\u0005"+
+		" \u0000\u0000\u0094\u0096\u0003\u001c\u000e\u0000\u0095\u0093\u0001\u0000"+
+		"\u0000\u0000\u0096\u0099\u0001\u0000\u0000\u0000\u0097\u0095\u0001\u0000"+
+		"\u0000\u0000\u0097\u0098\u0001\u0000\u0000\u0000\u0098\u0017\u0001\u0000"+
+		"\u0000\u0000\u0099\u0097\u0001\u0000\u0000\u0000\u009a\u009b\u0005\u0007"+
+		"\u0000\u0000\u009b\u00a0\u0003\u001c\u000e\u0000\u009c\u009d\u0005 \u0000"+
+		"\u0000\u009d\u009f\u0003\u001c\u000e\u0000\u009e\u009c\u0001\u0000\u0000"+
+		"\u0000\u009f\u00a2\u0001\u0000\u0000\u0000\u00a0\u009e\u0001\u0000\u0000"+
+		"\u0000\u00a0\u00a1\u0001\u0000\u0000\u0000\u00a1\u00a3\u0001\u0000\u0000"+
+		"\u0000\u00a2\u00a0\u0001\u0000\u0000\u0000\u00a3\u00a4\u0005\u001f\u0000"+
+		"\u0000\u00a4\u0019\u0001\u0000\u0000\u0000\u00a5\u00a6\u0005\u0002\u0000"+
+		"\u0000\u00a6\u00a7\u0005\u0016\u0000\u0000\u00a7\u00a8\u0005\u001e\u0000"+
+		"\u0000\u00a8\u00a9\u0005\u0017\u0000\u0000\u00a9\u00aa\u0005\u001f\u0000"+
+		"\u0000\u00aa\u001b\u0001\u0000\u0000\u0000\u00ab\u00ad\u0003 \u0010\u0000"+
+		"\u00ac\u00ae\u0005\b\u0000\u0000\u00ad\u00ac\u0001\u0000\u0000\u0000\u00ad"+
+		"\u00ae\u0001\u0000\u0000\u0000\u00ae\u00af\u0001\u0000\u0000\u0000\u00af"+
+		"\u00b0\u0005\u0016\u0000\u0000\u00b0\u001d\u0001\u0000\u0000\u0000\u00b1"+
+		"\u00b2\u0007\u0001\u0000\u0000\u00b2\u001f\u0001\u0000\u0000\u0000\u00b3"+
+		"\u00b4\u0007\u0002\u0000\u0000\u00b4!\u0001\u0000\u0000\u0000\u00b5\u00b6"+
+		"\u0007\u0003\u0000\u0000\u00b6#\u0001\u0000\u0000\u0000\u00b7\u00b8\u0005"+
+		"\u0018\u0000\u0000\u00b8%\u0001\u0000\u0000\u0000\u0014\'1369@FLU\\ks"+
+		"x{~\u0083\u008c\u0097\u00a0\u00ad";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/org/lumijiez/parser/SoftwareRequirementsVisitor.java b/src/main/java/org/lumijiez/parser/SoftwareRequirementsVisitor.java
index 50ae93b..ed8f466 100644
--- a/src/main/java/org/lumijiez/parser/SoftwareRequirementsVisitor.java
+++ b/src/main/java/org/lumijiez/parser/SoftwareRequirementsVisitor.java
@@ -16,6 +16,12 @@ public interface SoftwareRequirementsVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitProgram(SoftwareRequirementsParser.ProgramContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#program_body}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitProgram_body(SoftwareRequirementsParser.Program_bodyContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#requirementSpec}.
 	 * @param ctx the parse tree
@@ -23,11 +29,17 @@ public interface SoftwareRequirementsVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitRequirementSpec(SoftwareRequirementsParser.RequirementSpecContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#req_specification}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitDescription(SoftwareRequirementsParser.DescriptionContext ctx);
+	T visitReq_specification(SoftwareRequirementsParser.Req_specificationContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#result_specification}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitResult_specification(SoftwareRequirementsParser.Result_specificationContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#predicate}.
 	 * @param ctx the parse tree
@@ -59,11 +71,17 @@ public interface SoftwareRequirementsVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitFunctionSpec(SoftwareRequirementsParser.FunctionSpecContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#access_modifier}.
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#functionBody}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitAccess_modifier(SoftwareRequirementsParser.Access_modifierContext ctx);
+	T visitFunctionBody(SoftwareRequirementsParser.FunctionBodyContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#input_types}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitInput_types(SoftwareRequirementsParser.Input_typesContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#return_types}.
 	 * @param ctx the parse tree
@@ -71,23 +89,23 @@ public interface SoftwareRequirementsVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitReturn_types(SoftwareRequirementsParser.Return_typesContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#return}.
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#specification}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitReturn(SoftwareRequirementsParser.ReturnContext ctx);
+	T visitSpecification(SoftwareRequirementsParser.SpecificationContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#parameter_list}.
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#variable}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitParameter_list(SoftwareRequirementsParser.Parameter_listContext ctx);
+	T visitVariable(SoftwareRequirementsParser.VariableContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#parameter}.
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#importance}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitParameter(SoftwareRequirementsParser.ParameterContext ctx);
+	T visitImportance(SoftwareRequirementsParser.ImportanceContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#type}.
 	 * @param ctx the parse tree
@@ -100,4 +118,10 @@ public interface SoftwareRequirementsVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitAccess_modifiers(SoftwareRequirementsParser.Access_modifiersContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SoftwareRequirementsParser#description}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitDescription(SoftwareRequirementsParser.DescriptionContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/resources/TestProgram.txt b/src/main/resources/TestProgram.txt
index 412b02c..705dc54 100644
--- a/src/main/resources/TestProgram.txt
+++ b/src/main/resources/TestProgram.txt
@@ -1,9 +1,22 @@
-!DatabaseAccess:
-~This is for comments, or descriptions~
-{"UserIsAuthenticated" && "UserHasPermission"} => {"AccessToAdminPanel" || "AccessToModeratorPanel"};
+package Database {
+
+    ~This is for comments, or descriptions~
+    critical DatabaseAccess {
+        optional @UserHasAdminAccess;
+        critical @UserIsNotBanned;
+
+        result optional DatabaseAdminPanel;
+        result critical DatabaseVisualizerPanel;
+        result Clock;
+    }
+
+    ~This is for comments, or explanations~
+    critical public GetUserList(FLOAT[] x, STRING ag) {
+        @ExecTime : "10s";
+        @MaxReturnVals : "10s";
+        return INT x;
+    }
+
+}
+
 
-GetUserList():
-~This is for comments, or descriptions~
-Access PRIVATE;
-Return (INT x, FLOAT v);
-{"Execution Time" : "<1s", "MaxValue" : 100};