--- a/bin/kipling
+++ b/bin/kipling
@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'kipling'
 
-Kipling::Commands::KiplingParser.new.parse
\ No newline at end of file
+Kipling::CommandLine.new.parse
\ No newline at end of file

--- a/lib/kipling.rb
+++ b/lib/kipling.rb
@@ -7,4 +7,4 @@ require 'kipling/timeline'
 require 'kipling/renderer'
 require 'kipling/scanner'
 require 'kipling/reader'
-require 'kipling/commands'
+require 'kipling/command_line'

--- /dev/null
+++ b/lib/kipling/command_line.rb
@@ -0,0 +1,46 @@
+require 'cmdparse'
+
+module Kipling
+  # Various command line commands
+  module Commands
+  end
+
+  class CommandLine < CmdParse::CommandParser
+    def initialize
+      super(true,true)
+      self.program_name = "kipling"
+      self.program_version = Kipling::VERSION.split('.')
+      
+      @scanner = 'git'
+      @glob = 'stories/**/*.story'
+
+      self.options = CmdParse::OptionParserWrapper.new do |opt|
+        opt.separator "Global options:"
+        opt.on("--verbose", "Be verbose when outputting info") {|t| $verbose = true }
+        opt.on("--scanner=SCANNER", "What scanner to use. Valid values are git or file") {|v| @scanner = v }
+      end
+
+      add_command(CmdParse::HelpCommand.new)
+      add_command(CmdParse::VersionCommand.new)
+
+      require 'kipling/commands/snapshot_command'
+      require 'kipling/commands/timeline_command'
+      require 'kipling/commands/server_command'
+      add_command(Commands::SnapshotCommand.new)
+      add_command(Commands::TimelineCommand.new)
+      add_command(Commands::ServerCommand.new)
+    end
+    
+    def scanner
+      if @scanner == 'file'
+        scanner = Scanner::FileSystem.new(@glob)
+      else
+        scanner = Scanner::Git.new('.', 'stories/stories')
+      end
+    end
+    
+    def timeline(after, before)
+      scanner.timeline(after, before)
+    end
+  end
+end

--- a/lib/kipling/commands.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'kipling/commands/kipling_parser'
-require 'kipling/commands/view_command'
-require 'kipling/commands/timeline_command'
-require 'kipling/commands/server_command'
-
-module Kipling
-  # Various command line commands
-  module Commands
-  end
-end
\ No newline at end of file

--- a/lib/kipling/commands/kipling_parser.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'cmdparse'
-
-module Kipling
-  module Commands
-    class KiplingParser < CmdParse::CommandParser
-      def initialize
-        super(true,true)
-        self.program_name = "kipling"
-        self.program_version = Kipling::VERSION.split('.')
-        
-        @scanner = 'git'
-        @glob = 'stories/**/*.story'
-
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
-          opt.separator "Global options:"
-          opt.on("--verbose", "Be verbose when outputting info") {|t| $verbose = true }
-          opt.on("--scanner=SCANNER", "What scanner to use. Valid values are git or file") {|v| @scanner = v }
-        end
-
-        add_command(CmdParse::HelpCommand.new)
-        add_command(CmdParse::VersionCommand.new)
-        add_command(ViewCommand.new)
-        add_command(TimelineCommand.new)
-        add_command(ServerCommand.new)
-      end
-      
-      def scanner
-        if @scanner == 'file'
-          scanner = Scanner::FileSystem.new(@glob)
-        else
-          scanner = Scanner::Git.new('.', 'stories/stories')
-        end
-      end
-      
-      def timeline(after, before)
-        scanner.timeline(after, before)
-      end
-    end
-  end
-end

--- /dev/null
+++ b/lib/kipling/commands/snapshot_command.rb
@@ -0,0 +1,36 @@
+require 'cmdparse'
+
+module Kipling
+  module Commands
+    class SnapshotCommand < CmdParse::Command
+      def initialize
+        super('snapshot', false)
+        self.short_desc = "Print a snapshot of cards"
+        self.description = "This command prints a snapshot of cards in a grid, typically used in XP or Scrum projects"
+        
+        @format = 'ascii'
+        @attribute = 'state'
+        @n = 0
+        @sum = nil
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("--format=X",  "How to output format. Valid types are ascii or html") {|f| @format = f }
+          opt.on("--group=X",   "Name of card attribute cards will be grouped by") {|g| @attribute = g }
+          opt.on("--n=X",       "What point in time") {|p| @p = p.to_i }
+          opt.on("--sum=x",     "Add sum") {|s| @sum = s }
+        end
+      end
+      
+      def execute(args)
+        after = Time.now - 4*24*3600
+        before = Time.now
+        timeline = super_command.super_command.timeline(after, before)
+        points = timeline.points[@n]
+        cards = points[1]
+        card_view = CardView.new(cards, :attribute => @attribute, :sum => @sum)
+        renderer_class = {'ascii' => Renderer::Snapshot::Ascii, 'html' => Renderer::Snapshot::Html}[@format]
+        renderer = renderer_class.new(card_view)
+        renderer.render(STDOUT)
+      end
+    end
+  end
+end
\ No newline at end of file

--- a/lib/kipling/commands/view_command.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'cmdparse'
-
-module Kipling
-  module Commands
-    class ViewCommand < CmdParse::Command
-      def initialize
-        super('view', false)
-        self.short_desc = "Print a view of cards"
-        self.description = "This command prints cards in a grid, typically used in XP or Scrum projects"
-        
-        @format = 'txt'
-        @attribute = 'state'
-        @n = 0
-        @sum = nil
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
-          opt.on("--format=X",  "How to output format") {|f| @format = f }
-          opt.on("--group=X",   "Name of card attribute cards will be grouped by") {|g| @attribute = g }
-          opt.on("--n=X",       "What point in time") {|p| @p = p.to_i }
-          opt.on("--sum=x",     "Add sum") {|s| @sum = s }
-        end
-      end
-      
-      def execute(args)
-        after = Time.now - 4*24*3600
-        before = Time.now
-        timeline = super_command.super_command.timeline(after, before)
-        points = timeline.points[@n]
-        cards = points[1]
-        card_view = CardView.new(cards, :attribute => @attribute, :sum => @sum)
-        renderer_class = {'txt' => ConsoleRenderer, 'html' => HtmlRenderer}[@format]
-        renderer = renderer_class.new(card_view)
-        renderer.render(STDOUT)
-      end
-    end
-  end
-end
\ No newline at end of file