diff --git a/chatbug/__main__.py b/chatbug/__main__.py
index a49ac7d..f7cf8d8 100644
--- a/chatbug/__main__.py
+++ b/chatbug/__main__.py
@@ -1,7 +1,7 @@
 print("running __main__.-py")
 
-from chatbug.llama import main
+from chatbug.llama import main_func
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main_func()
\ No newline at end of file
diff --git a/chatbug/llama.py b/chatbug/llama.py
index e678777..eed4bfd 100644
--- a/chatbug/llama.py
+++ b/chatbug/llama.py
@@ -36,11 +36,11 @@ def initialize_config(inference: Inference) -> Terminal:
     return terminal
 
 
-def main():
+def main_func():
     inference = Inference(model_selection.get_model())
     terminal = initialize_config(inference)
     terminal.join()
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main_func()
\ No newline at end of file
diff --git a/chatbug/tool_functions.py b/chatbug/tool_functions.py
index 69e8f07..8dd4188 100644
--- a/chatbug/tool_functions.py
+++ b/chatbug/tool_functions.py
@@ -2,8 +2,6 @@ import random
 import datetime
 from chatbug.tool_helper import tool
 import chatbug.matheval as matheval
-# from chatbug.matheval import interpreter, lexer
-# from chatbug.matheval.ast import Parser
 import chatbug.utils as utils
 
 
@@ -58,10 +56,10 @@ Args:
         expression = "solve " + " and ".join(equations) + " for " + " and ".join(variables)
         print(expression)
 
-        tokens = lexer.tokenize(expression)
+        tokens = matheval.lexer.tokenize(expression)
         parser = ast.Parser()
         ast = parser.parse(tokens)
-        return interpreter.interpret(ast)
+        return matheval.interpreter.interpret(ast)
     except Exception as e:
             utils.print_error("Tool call evaluation failed. - " + str(e))
             return "Tool call evaluation failed."
diff --git a/setup.py b/setup.py
index 35ae4da..da335f5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,9 +14,15 @@ setup(
         'pytest',
         'pywebview',
     ],
-    # entry_points={
-    #     'console_scripts': [
-    #         'chatbug=chatbug.app:main',
-    #     ],
-    # },
+    entry_points={
+        'console_scripts': [
+            'chatbug=chatbug.llama:main_func',
+            # a^     b^       c^   d^
+            # a => the command line argument
+            # b => the package name
+            # c => the file name in the package (same as imports)
+            # d => the function to call
+            'chatbugui=chatbug.ui.__main__:start_ui',
+        ],
+    },
 )
\ No newline at end of file