diff --git a/pygo.py b/pygo.py
index d60a32c..26ecf5d 100755
--- a/pygo.py
+++ b/pygo.py
@@ -27,15 +27,23 @@ def load_png(name):
 
 def build_img_res():
     ret = {}
+
+    triangle = load_png('go_t.png')
     
     ret['w'] = load_png('go_w.png')
-    ret['wT'] = load_png('go_wT.png')
+    ret['wT'] = load_png('go_w.png')
+    ret['wT'].blit(triangle, (0,0))
+
     ret['b'] = load_png('go_b.png')
-    ret['bT'] = load_png('go_bT.png')
+    ret['bT'] = load_png('go_b.png')
+    ret['bT'].blit(triangle, (0,0))
+
+    circle = load_png('go_c.png')
 
     for d in ('u', 'd', 'l', 'r', 'm', 'dl', 'dr', 'ul', 'ur', 'h'):
         ret[d] = load_png('go_' + d + '.png')
-        ret[d + 'c'] = load_png('go_' + d + 'c.png')
+        ret[d + 'c'] = load_png('go_' + d + '.png')
+        ret[d + 'c'].blit(circle, (0,0))
 
     return ret
 
@@ -120,7 +128,10 @@ def main():
         for j in range(19):
             goban[i].append(GobanSquare((i+1, j+1)))
             
-    board = draw_board(goban, 800, img_res)
+    board_size = 800
+    board_inc = board_size / 19
+
+    board = draw_board(goban, board_size, img_res)
     background.blit(board, (0,0))
     
     screen.blit(background, (0, 0))
@@ -131,9 +142,23 @@ def main():
         
         if event.type == QUIT:
             return
+        if event.type == MOUSEBUTTONDOWN:
+            if event.button == 1:
+                state = 'black'
+            if event.button == 2:
+                state = 'marked'
+            if event.button == 3:
+                state = 'white'
+
+            x, y = event.pos
+            goban[y / board_inc][x / board_inc].state = state
         
-        screen.blit(background, (0,0))
+        board = draw_board(goban, board_size, img_res)
+        background.blit(board, (0,0))
+    
+        screen.blit(background, (0, 0))
         pygame.display.flip()
+
     
 
 if __name__ == '__main__': main()
diff --git a/res/go_c.png b/res/go_c.png
new file mode 100644
index 0000000..f95172f
Binary files /dev/null and b/res/go_c.png differ
diff --git a/res/go_dc.png b/res/go_dc.png
deleted file mode 100644
index 5b77365..0000000
Binary files a/res/go_dc.png and /dev/null differ
diff --git a/res/go_dlc.png b/res/go_dlc.png
deleted file mode 100644
index 46b5d61..0000000
Binary files a/res/go_dlc.png and /dev/null differ
diff --git a/res/go_drc.png b/res/go_drc.png
deleted file mode 100644
index 8e28321..0000000
Binary files a/res/go_drc.png and /dev/null differ
diff --git a/res/go_hc.png b/res/go_hc.png
deleted file mode 100644
index d8c4f78..0000000
Binary files a/res/go_hc.png and /dev/null differ
diff --git a/res/go_lc.png b/res/go_lc.png
deleted file mode 100644
index 3beb63d..0000000
Binary files a/res/go_lc.png and /dev/null differ
diff --git a/res/go_mc.png b/res/go_mc.png
deleted file mode 100644
index e5d884d..0000000
Binary files a/res/go_mc.png and /dev/null differ
diff --git a/res/go_rc.png b/res/go_rc.png
deleted file mode 100644
index a283d06..0000000
Binary files a/res/go_rc.png and /dev/null differ
diff --git a/res/go_t.png b/res/go_t.png
new file mode 100644
index 0000000..8d530d8
Binary files /dev/null and b/res/go_t.png differ
diff --git a/res/go_uc.png b/res/go_uc.png
deleted file mode 100644
index 370dd88..0000000
Binary files a/res/go_uc.png and /dev/null differ
diff --git a/res/go_ulc.png b/res/go_ulc.png
deleted file mode 100644
index bbdd9c6..0000000
Binary files a/res/go_ulc.png and /dev/null differ
diff --git a/res/go_urc.png b/res/go_urc.png
deleted file mode 100644
index e9847d0..0000000
Binary files a/res/go_urc.png and /dev/null differ