diff --git a/agents/gnn_dqn/gnn_dqn_agent.py b/agents/gnn_dqn/gnn_dqn_agent.py
new file mode 100644
index 0000000..fa03e95
--- /dev/null
+++ b/agents/gnn_dqn/gnn_dqn_agent.py
@@ -0,0 +1,258 @@
+# Authors:  Ondrej Lukas - ondrej.lukas@aic.fel.cvut.cz    
+import numpy as np
+import argparse
+import os
+os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2'
+import sys
+import tensorflow_gnn as tfgnn
+import tensorflow as tf
+from tensorflow_gnn.models.gcn import gcn_conv
+import random
+from datetime import datetime
+from collections import deque
+
+# This is used so the agent can see the environment and game components
+from os import path
+sys.path.append(path.dirname(path.dirname(path.dirname( path.dirname( path.abspath(__file__) ) ) )))
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__) )))
+
+#with the path fixed, we can import now
+from env.game_components import GameState, Action
+from base_agent import BaseAgent
+from graph_agent_utils import state_as_graph
+from agent_utils import generate_valid_actions
+
+os.environ['CUDA_VISIBLE_DEVICES'] = '-1'
+tf.get_logger().setLevel('ERROR')
+
+
+class GnnDQNAgent(BaseAgent):
+    """
+    Class implementing the DQN algorithm with GNN as input layer
+    """
+
+    def __init__(self, args: argparse.Namespace):
+        super().__init__(args.host, args.port, args.role)
+        self.args = args
+        graph_schema = tfgnn.read_schema(os.path.join(path.dirname(path.abspath(__file__)),"./schema.pbtxt"))
+        self._example_input_spec = tfgnn.create_graph_spec_from_schema_pb(graph_schema)
+        run_name = f'netsecgame__GNN_DQN_{datetime.now().strftime("%Y/%m/%d_%H:%M:%S")}'
+        self._tf_writer = tf.summary.create_file_writer("./logs/"+ run_name)
+        self.replay_memory = deque(maxlen=args.rb_length)
+        self._MAE_metric = tf.keras.metrics.MeanAbsoluteError()
+        
+        self.epsilon = args.max_epsilon
+
+        register_obs = self.register()
+        num_actions = register_obs.info["num_actions"]
+        self.num_actions = num_actions
+        self.actions_idx = {}
+        self.idx_to_action = {}
+        
+        def set_initial_node_state(node_set, node_set_name):
+            d1 = tf.keras.layers.Dense(128,activation="relu")(node_set["node_type"])
+            return tf.keras.layers.Dense(64,activation="relu")(d1)
+
+        #input
+        input_graph = tf.keras.layers.Input(type_spec=self._example_input_spec, name="input")
+        #process node features with FC layer
+        graph = tfgnn.keras.layers.MapFeatures(node_sets_fn=set_initial_node_state, name="node_preprocessing")(input_graph)
+        # Graph convolution
+        for i in range(args.graph_updates):
+            graph = gcn_conv.GCNHomGraphUpdate(units=128, add_self_loops=True, name=f"GCN_{i+1}")(graph)
+        pooling = tfgnn.keras.layers.Pool(tfgnn.CONTEXT, "sum",node_set_name="nodes", name="pooling")(graph)
+        # Two hidden layers (Following the DQN)
+        hidden1 = tf.keras.layers.Dense(128, activation="relu", name="hidden1",kernel_initializer=tf.keras.initializers.HeUniform())(pooling)
+        hidden2 = tf.keras.layers.Dense(64, activation="relu", name="hidden2", kernel_initializer=tf.keras.initializers.HeUniform())(hidden1)
+        output = tf.keras.layers.Dense(num_actions, activation=None, name="output")(hidden2)
+        self._model = tf.keras.Model(input_graph, output, name="Q1")
+        self._model.compile(tf.keras.optimizers.Adam(learning_rate=args.lr))
+        self._target_model = tf.keras.models.clone_model(self._model)
+        self._model.summary()
+
+    def _build_batch_graph(self, state_graphs)->tfgnn.GraphTensor:
+        """Method which combines a batch of grap_tensors into a single scalar tensor"""
+        self.logger.debug(f"Building scalar graphs from {len(state_graphs)} states")
+        def _gen_from_list():
+            for g in state_graphs:
+                yield g
+        ds = tf.data.Dataset.from_generator(_gen_from_list, output_signature=self._example_input_spec)
+        graph_tensor_batch = next(iter(ds.batch(self.args.batch_size)))
+        scalar_graph_tensor = graph_tensor_batch.merge_batch_to_components()
+        return scalar_graph_tensor
+    
+    def state_to_graph_tensor(self, state:GameState)->tfgnn.GraphTensor:
+        "Method which converts GameState into GraphTensor"
+        X,E = state_as_graph(state)
+        src,trg = [x[0] for x in E],[x[1] for x in E]
+        
+        graph_tensor =  tfgnn.GraphTensor.from_pieces(
+                node_sets = {"nodes":tfgnn.NodeSet.from_fields(
+                    sizes = [X.shape[0]],
+                    features = {"node_type":X}
+                )},
+                edge_sets = {
+                    "related_to": tfgnn.EdgeSet.from_fields(
+                    sizes=[len(src)],
+                    features = {},
+                    adjacency=tfgnn.Adjacency.from_indices(
+                    source=("nodes", np.array(src, dtype='int32')),
+                    target=("nodes", np.array(trg, dtype='int32'))))
+                }
+            )
+        return graph_tensor
+
+    def predict_action(self, state, training=False)-> Action:
+        valid_actions = self.get_valid_actions(state)
+        # random action
+        if training and np.random.uniform() < self.epsilon:
+            return random.choice(valid_actions)
+        else:
+            valid_action_indices = tf.constant([self.actions_idx[a] for a in valid_actions], dtype=tf.int32)
+            # greedy action
+            state_graph = self.state_to_graph_tensor(state)
+            model_output = tf.squeeze(self._model(state_graph))
+            max_idx = np.argmax(tf.gather(model_output, valid_action_indices))
+            return self.idx_to_action[max_idx]
+
+    def _make_training_step(self, inputs, y_true)->None:
+        #perform training step
+        with tf.GradientTape() as tape:
+            #y_hat = tf.gather_nd(self._model(inputs, training=True), actions)
+            y_hat = self._model(inputs, training=True)
+            mse = tf.keras.losses.MeanSquaredError()
+            hubber  = tf.keras.losses.Huber()
+            loss = hubber(y_true, y_hat)
+        grads = tape.gradient(loss, self._model.trainable_weights)
+        #grads, _ = tf.clip_by_global_norm(grads, 5.0)
+        self._model.optimizer.apply_gradients(zip(grads, self._model.trainable_weights))
+        self._MAE_metric.update_state(y_true, y_hat)
+        with self._tf_writer.as_default():
+            tf.summary.scalar('train/MSE_Q', mse(y_true, y_hat), step=self._model.optimizer.iterations)
+            tf.summary.scalar('train/loss_Q', loss, step=self._model.optimizer.iterations)
+
+    def process_rewards(self, transition:tuple)->float:
+        _,_,r,s_next,end = transition
+        if end:
+            return r #terminal state, return just the reward
+        else:
+            valid_actions = self.get_valid_actions(s_next)
+            valid_action_indices = np.array([self.actions_idx[a] for a in valid_actions])
+            state_graph = self.state_to_graph_tensor(s_next)
+            model_output = tf.squeeze(self._target_model(state_graph))
+            return r + args.gamma*np.max(tf.gather(model_output, valid_action_indices))
+    
+    def get_valid_actions(self, state:GameState):
+        valid_actions = generate_valid_actions(state)
+        for a in valid_actions:
+            if a not in self.actions_idx:
+                idx = len(self.actions_idx)
+                self.actions_idx[a] = idx
+                self.idx_to_action[idx] = a
+        return valid_actions
+    
+    def evaluate_episode(self)->float:
+        """
+        Method for running agent performance evaluation.
+        """
+        observation = self.request_game_reset()
+        ret = 0
+        while not observation.end:
+            current_state = observation.state
+            action = self.predict_action(current_state, training=False)
+            observation = self.make_step(action)
+            ret += observation.reward
+        return ret, observation.reward
+    
+    def evaluate(self, num_episodes:int)->tuple:
+        returns = []
+        wins = 0
+        detections = 0
+        timeouts = 0
+        for _ in range(num_episodes):
+            ret, end_reward = self.evaluate_episode()
+            returns.append(ret)
+            if end_reward > 10:
+                    wins += 1
+            elif end_reward < -1:
+                detections += 1
+            elif end_reward == -1:
+                timeouts += 1
+        mean_ret = np.mean(returns)
+        mean_win = wins/num_episodes
+        mean_detection =  detections/num_episodes
+        mean_timeouts = timeouts/num_episodes
+        with self._tf_writer.as_default():
+            tf.summary.scalar('eval/mean_return', mean_ret, step=self._model.optimizer.iterations)
+            tf.summary.scalar('eval/mean_winrate', mean_win, step=self._model.optimizer.iterations)
+            tf.summary.scalar('eval/mean_detection_rate', mean_detection, step=self._model.optimizer.iterations)
+            tf.summary.scalar('eval/mean_timeout_rate', mean_timeouts, step=self._model.optimizer.iterations)
+        return mean_ret, mean_win, mean_detection
+    
+    def train(self):
+        self._MAE_metric.reset_state()
+        for episode in range(self.args.episodes):
+            observation = self.request_game_reset()
+            while not observation.end:
+                current_state = observation.state
+                action = self.predict_action(current_state, training=True)
+                next_observation = self.make_step(action)
+                reward = next_observation.reward
+                self.replay_memory.append((current_state, action, reward, next_observation.state, next_observation.end))
+                if reward > 0:
+                    print(action, reward)
+                observation = next_observation
+            # Enough data collected, lets train
+            if len(self.replay_memory) >= 4*self.args.batch_size:
+                batch_targets = np.zeros([self.args.batch_size, self.num_actions])
+                batch_transitions = random.sample(self.replay_memory, self.args.batch_size)
+                # batch_actions = [(i, self.actions_idx[t[1]]) for i,t in enumerate(batch_transitions)]
+                # batch_targets = np.array([self.process_rewards(t) for t in batch_transitions])
+                state_graphs = []
+                for i,t in enumerate(batch_transitions):
+                    as_graph = self.state_to_graph_tensor(t[0])
+                    max_future_q = self.process_rewards(t)
+                    batch_targets[i] = self._model(as_graph)
+                    batch_targets[i][self.actions_idx[t[1]]] = max_future_q
+                    state_graphs.append(as_graph)
+                batch_inputs = self._build_batch_graph(state_graphs)
+                self._make_training_step(batch_inputs, batch_targets)
+            # update target model
+            if episode > 0 and episode % self.args.update_target_each == 10:
+                self._target_model.set_weights(self._model.get_weights())
+            # evaluate
+            if episode > 0 and  episode % self.args.eval_each == 0:
+                returns, wins, detections = self.evaluate(self.args.eval_for)
+                print(f"Evaluation after episode {episode}: avg_ret:{returns}, avg_win:{wins}, avg_detection:{detections}")
+            # update epsilon
+            self.epsilon = self.args.min_epsilon + (self.args.max_epsilon - self.args.min_epsilon) * np.exp(-self.args.epsilon_decay * episode)
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--host", help="Host where the game server is", default="127.0.0.1", action='store', required=False)
+    parser.add_argument("--port", help="Port where the game server is", default=9000, type=int, action='store', required=False)
+    parser.add_argument("--role", help="Role of the agent", default="Attacker", type=str, action='store', required=False)
+
+    #model arguments
+    parser.add_argument("--gamma", help="Sets gamma for discounting", default=0.9, type=float)
+    parser.add_argument("--batch_size", help="Batch size for NN training", type=int, default=32)
+    parser.add_argument("--graph_updates", help="Number of GCN passes", type=float, default=3)
+    parser.add_argument("--rb_length", help="Size of the replay memory", type=int, default=5000)
+    parser.add_argument("--lr", help="Learning rate", type=float, default=1e-2)
+    parser.add_argument("--alpha", help="Learning rate", type=float, default=0.8)
+    parser.add_argument("--min_epsilon", help="Learning rate", type=float, default=0.01)
+    parser.add_argument("--max_epsilon", help="Batch size for NN training", type=int, default=1)
+    parser.add_argument("--epsilon_decay", help="Batch size for NN training", type=int, default= 0.01)
+    
+    #training arguments
+    parser.add_argument("--episodes", help="Sets number of training episodes", default=5000, type=int)
+    parser.add_argument("--eval_each", help="During training, evaluate every this amount of episodes.", default=250, type=int)
+    parser.add_argument("--eval_for", help="Sets evaluation length", default=50, type=int)
+    parser.add_argument("--final_eval_for", help="Sets evaluation length", default=1000, type=int)
+    parser.add_argument("--update_target_each", help="Set how often should be target model updated", type=int, default=50)
+
+
+    args = parser.parse_args()
+    args.filename = "GNN_DQN_Agent_" + ",".join(("{}={}".format(key, value) for key, value in sorted(vars(args).items()) if key not in ["evaluate", "eval_each", "eval_for"])) + ".pickle"
+    agent = GnnDQNAgent(args)
+    agent.train()
+   
\ No newline at end of file
diff --git a/agents/gnn_dqn/schema.pbtxt b/agents/gnn_dqn/schema.pbtxt
new file mode 100644
index 0000000..ed9de38
--- /dev/null
+++ b/agents/gnn_dqn/schema.pbtxt
@@ -0,0 +1,23 @@
+node_sets {
+  key: "nodes"
+  value {
+    features {
+      key: "node_type"
+      value {
+        dtype: DT_INT32
+        shape {
+          dim {
+            size: 5
+          }
+        }
+      }
+    }
+  }
+}
+edge_sets {
+  key: "related_to"
+  value {
+    source: "nodes"
+    target: "nodes"
+  }
+}
\ No newline at end of file
diff --git a/agents/graph_agent_utils.py b/agents/graph_agent_utils.py
new file mode 100644
index 0000000..60f494d
--- /dev/null
+++ b/agents/graph_agent_utils.py
@@ -0,0 +1,73 @@
+"""
+Collection of functions which are intended for graph based agents to share.
+Functionality which is specific for a certain type of agent should be implementented
+directly in the agent class. 
+
+author: Ondrej Lukas - ondrej.lukas@aic.fel.cvut.cz
+"""
+import sys
+import os
+import ipaddress
+import numpy as np
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname( os.path.abspath(__file__) ))))
+#with the path fixed, we can import now
+from env.game_components import GameState, IP, Network, Data, Service
+
+def state_as_graph(state:GameState) -> tuple:
+    node_types = {
+        "network":0,
+        "known_host":1,
+        "controlled_host":2,
+        "service":3,
+        "datapoint":4
+    }
+    graph_nodes = {}
+    total_nodes = len(state.known_networks) + len(state.known_hosts) + sum([len(x) for x in state.known_services.values()]) + sum([len(x) for x in state.known_data.values()])
+    edge_list = []
+    node_features = np.zeros([total_nodes, len(node_types)],dtype=np.int32)
+    
+    # networks
+    for net in state.known_networks:
+        graph_nodes[net] = len(graph_nodes)
+        node_features[graph_nodes[net]][node_types["network"]] = 1    
+    # hosts
+    for host in state.known_hosts:
+        graph_nodes[host] = len(graph_nodes)
+        # add to adjacency matrix if it is part of network
+        ip_addr = ipaddress.ip_address(str(host))
+        for net in state.known_networks:
+            if ip_addr in ipaddress.ip_network(str(net), strict=False):
+                edge_list.append((graph_nodes[net], graph_nodes[host]))
+                edge_list.append((graph_nodes[host], graph_nodes[net]))
+        if host in state.controlled_hosts:
+            node_features[graph_nodes[host]][node_types["controlled_host"]] = 1   
+        else:
+            node_features[graph_nodes[host]][node_types["known_host"]] = 1
+    # services
+    for host, service_list in state.known_services.items():
+        for service in service_list:
+            graph_nodes[service] = len(graph_nodes)
+            node_features[graph_nodes[service]][node_types["service"]] = 1
+            edge_list.append((graph_nodes[host], graph_nodes[service]))
+            edge_list.append((graph_nodes[service], graph_nodes[host]))
+    # data
+    for host, data_list in state.known_data.items():
+        for data in data_list:
+            graph_nodes[data] = len(graph_nodes)
+            node_features[graph_nodes[data]][node_types["datapoint"]] = 1
+            edge_list.append((graph_nodes[host], graph_nodes[data]))
+            edge_list.append((graph_nodes[data], graph_nodes[host]))
+    
+    # make edges bidirectional
+    return node_features, edge_list
+
+if __name__ == '__main__':
+    state = GameState(known_networks={Network("192.168.1.0", 24),Network("1.1.1.2", 24)},
+                known_hosts={IP("192.168.1.2"), IP("192.168.1.3")}, controlled_hosts={IP("192.168.1.2")},
+                known_services={IP("192.168.1.3"):{Service("service1", "public", "1.01", True)}},
+                known_data={IP("192.168.1.3"):{Data("ChuckNorris", "data1"), Data("ChuckNorris", "data2")},
+                            IP("192.168.1.2"):{Data("McGiver", "data2")}})
+    X,A = state_as_graph(state)
+    print(X)
+    print(A)
\ No newline at end of file