diff --git a/mpdclient.lisp b/mpdclient.lisp
index 8398ff8..408ae44 100644
--- a/mpdclient.lisp
+++ b/mpdclient.lisp
@@ -25,8 +25,8 @@
 (eval-when (:compile-toplevel :load-toplevel)
   (declaim (optimize (speed 0) (space 0) (safety 1) (debug 3) (compilation-speed 0))))
 
-(defpackage #:mpd
-  (:use #:cl))
+;; (defpackage #:mpd
+;;   (:use #:cl))
 
 (in-package #:mpd)
 
@@ -35,7 +35,7 @@
   #+sbcl (require :sb-bsd-sockets)
   #+lispworks (require "comm"))
 
-(defconstant +mpd-welcome-message+       "OK MPD ")
+(defvar +mpd-welcome-message+       "OK MPD ")
 ;;; These aren't used yet, but will be soon.
 (defconstant +mpd-error-not-list+        1)
 (defconstant +mpd-error-arg+             2)
@@ -578,13 +578,11 @@
 
 (defclass mpd-client ()
   ((iostream
-     :initform nil
      :initarg :iostream
      :accessor mpd-iostream
      :type iostream
      :documentation "The input/output stream to MPD.")
    (socket
-     :initform nil
      :initarg :socket
      :accessor mpd-socket
      :type socket
@@ -790,7 +788,6 @@
      :type integer
      :documentation "Current song stopped on or playing, playlist songid.")
    (time
-     :initform 0
      :initarg :time
      :accessor mpd-status-time
      :type string
@@ -808,7 +805,6 @@
      :type integer
      :documentation "Crossfade in seconds.")
    (audio
-     :initform nil
      :initarg :audio
      :accessor mpd-status-audio
      :type string
@@ -881,55 +877,47 @@
 
 (defclass mpd-song ()
   ((file
-     :initform nil
      :initarg :file
      :accessor mpd-song-file
      :type string
      :documentation "Relative pathname of the the current playing/paused song.")
    (artist
-     :initform nil
      :initarg :artist
      :accessor mpd-song-artist
      :type string
      :documentation "Song artist, may be nil.")
    (title
-     :initform nil
      :initarg :title
      :accessor mpd-song-title
      :type string
      :documentation "Song title, may be nil.")
    (album
-     :initform nil
      :initarg :album
      :accessor mpd-song-album
      :type string
      :documentation "Song album, may be nil.")
    (track
-     :initform nil
      :initarg :track
      :accessor mpd-song-track
      :type string
      :documentation "Song track, may be nil.")
    (name
-     :initform nil
+     :initform ""
      :initarg :name
      :accessor mpd-song-name
      :type string
      :documentation "Song name, may be nil.")
    (date
-     :initform nil
      :initarg :date
      :accessor mpd-song-date
      :type string
      :documentation "I'm not sure wtf this is here for...?")
    (genre
-     :initform nil
      :initarg :genre
      :accessor mpd-song-genre
      :type string
      :documentation "Song's genre.")
    (composer
-     :initform nil
      :initarg :composer
      :accessor mpd-song-composer
      :type string
@@ -941,7 +929,6 @@
      :type integer
      :documentation "Song length in seconds.")
    (position
-     :initform nil
      :initarg :position
      :accessor mpd-song-position
      :type integer
@@ -953,7 +940,7 @@
      :type integer
      :documentation "Song ID for a song in the playlist.")
    (initialized
-     :initform nil
+     :initform 0
      :accessor mpd-song-initialized
      :type integer
      :documentation "0 or 1: Keeps tabs on if this object has been initialized.")))
diff --git a/systems.csv b/systems.csv
new file mode 100644
index 0000000..e69de29