diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c3b5bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/game.fasl
diff --git a/game.lisp b/game.lisp
index 6ccf523..7a50eb6 100644
--- a/game.lisp
+++ b/game.lisp
@@ -1,48 +1,46 @@
-(ql:quickload :claw-raylib)
-(ql:quickload :cffi)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (ql:quickload :cl-raylib))
 
-(in-package :cffi)
+(defpackage :raylib-user
+  (:use :cl :3d-vectors)
+  (:local-nicknames (:rl :raylib)))
 
-(rename-package (find-package :raylib) :rl)
+(in-package :raylib-user)
 
 (defparameter *move-speed* 2.0)
 
-(defmacro is-key-down (key)
-  `(rl:is-key-down (foreign-enum-value 'rl:keyboard-key ,key)))
-
-(defun v2+ (v1 v2) (rl:vector2-add v1 v2))
-(defun v2- (v1 v2) (rl:vector2-subtract v1 v2))
-(defun v2* (v1 n) (rl:vector2-scale v1 n))
-
 (defstruct game-state
-  (player-pos (rl:make-vector2 :x 100.0 :y 100.0)))
+  (player-pos (vec 100 100)))
 
 (defun game-input (state)
   (with-slots ((pos player-pos)) state
     (let ((dx 0.0) (dy 0.0))
-      (when (is-key-down :right) (incf dx 1))
-      (when (is-key-down :left)  (decf dx 1))
-      (when (is-key-down :up)    (decf dy 1))
-      (when (is-key-down :down)  (incf dy 1))
-      (setf pos (v2+ pos (v2* (rl:vector2-normalize (rl:make-vector2 :x dx :y dy))
-                              *move-speed*))))))
+      (when (rl:is-key-down :key-right) (incf dx 1))
+      (when (rl:is-key-down :key-left)  (decf dx 1))
+      (when (rl:is-key-down :key-up)    (decf dy 1))
+      (when (rl:is-key-down :key-down)  (incf dy 1))
+      (setf pos (v+ pos (v* (vunit* (vec dx dy)) *move-speed*)))
+      )))
 
-(defun game-update (state)
+(defun game-update (state) ())
+
+(defun game-draw (state)
   (rl:draw-rectangle-v (game-state-player-pos state)
-                       (rl:make-vector2 :x 100.0 :y 100.0)
-                       rl:+skyblue+)
+                       (vec 100 100)
+                       :skyblue)
   (rl:draw-fps 10 5))
 
-(defun basic-window ()
-  (let ((screen-width 800)
-        (screen-height 450)
-        (game-state (make-game-state)))
-    (rl:with-window ("CL Game" (screen-width screen-height))
+(defun main ()
+  (let* ((screen-width 800)
+         (screen-height 450)
+         (game-state (make-game-state)))
+    (rl:with-window (screen-width screen-height "CL Game")
       (rl:set-target-fps 60)
       (loop :until (rl:window-should-close)
-            :do (rl:with-drawing
-                  (rl:clear-background rl:+raywhite+)
-                  (game-input game-state)
-                  (game-update game-state))))))
+            :do (game-input game-state)
+                (game-update game-state)
+                (rl:with-drawing
+                  (rl:clear-background :raywhite)
+                  (game-draw game-state))))))
 
-(basic-window)
+(main)