diff --git a/generators/generator.py b/generators/generator.py
index ffe3497..49ca48b 100644
--- a/generators/generator.py
+++ b/generators/generator.py
@@ -11,10 +11,24 @@ class Generator:
 		self.output_path = output_path
 		self.variables = {}
 		self.constants = {}
+		self.structs = {}
+		self.functions: dict[str, FunctionNode] = {}
 		self.labels = []
 		self.constants_reverse = {}
 		self.constant_counter = 0
 
+	def ground_type_to_node(self, ground_type: str):
+		if ground_type == "string":
+			return StringNode
+		elif ground_type == "int":
+			return IntNode
+		elif ground_type == "float":
+			return FloatNode
+		elif ground_type == "bool":
+			return BoolNode
+		else:
+			return ground_type
+
 	def add_constant(self, value: Any, no_string: bool = False):
 		existing_constant_name = self.constants_reverse.get(value, None)
 		if existing_constant_name != None: return f"[.{existing_constant_name}]"
@@ -23,6 +37,9 @@ class Generator:
 		self.constant_counter += 1
 		return "[.LC" + str(self.constant_counter-1) + "]"
 	
+	def add_function(self, node: FunctionNode):
+		self.functions[node.name] = node
+	
 	def clamp_instruction_args(self, instruction: InstructionNode, min_args: int, max_args: int):
 		if len(instruction.arguments) < min_args:
 			traceback(self.code, "TypeError", f"{instruction.instruction} expects at least {min_args} arguments.")
diff --git a/generators/x86_64.py b/generators/x86_64.py
index 9a26988..1c97690 100644
--- a/generators/x86_64.py
+++ b/generators/x86_64.py
@@ -167,6 +167,7 @@ class X86_64Generator(Generator):
 		self.function_lines.append(node.name + ":")
 		for inst in node.statements:
 			self.generate_InstructionNode(inst, self.function_lines)
+		self.add_function(node)
 
 	def generate_InstructionNode(self, node: InstructionNode, lines = None):
 		if lines == None:
@@ -420,13 +421,33 @@ class X86_64Generator(Generator):
 		elif node.instruction == "endfun":
 			return
 		elif node.instruction == "return":
+			self.clamp_instruction_args(node, 0, 1)
+
+			if len(node.arguments) == 1:
+				if isinstance(node.arguments[0], IntNode):
+					lines.append(f"mov rax, {node.arguments[0].value}")
+				elif isinstance(node.arguments[0], BoolNode):
+					lines.append(f"mov rax, {int(node.arguments[0].value)}")
+				elif isinstance(node.arguments[0], FloatNode):
+					lines.append(f"mov xmm0, {node.arguments[0].value}")
+			else:
+				lines.append("mov rax, 0\n\t")
+
 			lines.append("ret\n\t")
 		elif node.instruction == "call":
-			self.clamp_instruction_args(node, 1, 1)
+			self.clamp_instruction_args(node, 1, 2)
 			if not isinstance(node.arguments[0], FunctionCallNode):
 				traceback(self.code, "TypeError", "Argument 1 of call needs to be a function reference.")
+			if not isinstance(node.arguments[1], VarPointerNode):
+				traceback(self.code, "TypeError", "Argument 1 of call needs to be a variable pointer.")
 
 			lines.append(f"call {node.arguments[0].func_name}\n\t")
+			
+			if len(node.arguments) == 2:
+				if self.variables.get(node.arguments[1].var_name, None):
+					self.change_variable(lines, node.arguments[1].var_name, "rax")
+				else:
+					self.create_variable(lines, node.arguments[1].var_name, "rax", self.ground_type_to_node(self.functions.get(node.arguments[0].func_name).return_type))
 
 		else:
 			raise NotImplementedError(f"A generate method hasn't been made for the \"{node.instruction}\" instruction.")
diff --git a/out b/out
index 07c8fcc..b2d7f9d 100644
Binary files a/out and b/out differ
diff --git a/out.asm b/out.asm
index 9817ca5..469168e 100644
--- a/out.asm
+++ b/out.asm
@@ -7,14 +7,9 @@ section .text
 global _start
 _start: 
 call test
-push 2
-push 3
-mov rax, [rsp + 8]
-mov rbx, [rsp + 0]
-add rax, rbx
-mov QWORD [rsp + 8], rax
+push rax
 mov rax, 60
-mov rdi, [rsp + 8]
+mov rdi, [rsp + 0]
 syscall 
 test: 
 mov rsi, .LC0
@@ -22,4 +17,5 @@ mov rdx, .LC1
 mov rax, 1
 mov rdi, 1
 syscall 
+mov rax, 123
 ret 
diff --git a/test2.grnd b/test2.grnd
index 7192c58..3d4643a 100644
--- a/test2.grnd
+++ b/test2.grnd
@@ -1,10 +1,7 @@
-fun -string !test
+fun -int !test
 	stdout "this was called by a function!!!!\n"
-	return
+	return 123
 endfun
 
-call !test
-set &x 2
-set &y 3
-add $x $y &x
-end $x
\ No newline at end of file
+call !test &var
+end $var
\ No newline at end of file