diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py
index 39e38fd..71652ab 100644
--- a/solvable/src/event_handler_main.py
+++ b/solvable/src/event_handler_main.py
@@ -10,6 +10,7 @@ from tfw.components import IdeEventHandler, TerminalEventHandler
 from tfw.components import ProcessManagingEventHandler, BashMonitor
 from tfw.components import TerminalCommands, LogMonitoringEventHandler
 from tfw.components import FSMManagingEventHandler, DirectorySnapshottingEventHandler
+from tfw.components import FrontendEventHandler
 from tfw.networking import MessageSender, TFWServerConnector
 from tfw.config import TFWENV
 from tfw.config.logs import logging
@@ -44,7 +45,7 @@ class TestCommands(TerminalCommands):
         """
         if not args:
             message_template = """'{"key": "", "data": {"command": ""}}'"""
-            TFWServerConnector().send_to_eventhandler({
+            TFWServerConnector().send_message({
                 'key': 'shell',
                 'data': {
                     'command': 'write',
@@ -52,7 +53,7 @@ class TestCommands(TerminalCommands):
                 }
             })
         else:
-            TFWServerConnector().send(literal_eval(args[0]))
+            TFWServerConnector().send_message(literal_eval(args[0]))
 
     def command_seppuku_tfw(self, *args):
         """
@@ -65,14 +66,14 @@ class TestCommands(TerminalCommands):
             'clear && echo "Committed seppuku! :)" && sleep infinity'
         )
         uplink = TFWServerConnector()
-        uplink.send_to_eventhandler({
+        uplink.send_message({
             'key': 'shell',
             'data': {
                 'command': 'write',
                 'value': f'{seppuku}\n'
             }
         })
-        uplink.send({
+        uplink.send_message({
             'key': 'dashboard',
             'data': {
                 'command': 'reloadFrontend'
@@ -139,6 +140,7 @@ def main():
             TFWENV.WEBSERVICE_DIR
         ]
     )
+    frontend = FrontendEventHandler()  # Proxies frontend API calls to frontend
 
     # Your custom event handlers
     message_fsm_steps_eh = MessageFSMStepsEventHandler(