Index: /trunk/DataStore/Build.PL
===================================================================
--- /trunk/DataStore/Build.PL	(revision 6472)
+++ /trunk/DataStore/Build.PL	(revision 6473)
@@ -4,5 +4,5 @@
 Module::Build->new(
     module_name         => 'DataStore',
-    dist_version_from   => 'lib/DataStore/Parser.pm',
+    dist_version_from   => 'lib/DataStore/FileSet/Parser.pm',
     author              => 'Joshua Hoblitt <jhoblitt@cpan.org>',
     license             => 'gpl',
Index: /trunk/DataStore/MANIFEST
===================================================================
--- /trunk/DataStore/MANIFEST	(revision 6472)
+++ /trunk/DataStore/MANIFEST	(revision 6473)
@@ -6,5 +6,5 @@
 Build.PL
 Makefile.PL
-lib/DataStore/Parser.pm
+lib/DataStore/FileSet/Parser.pm
 t/00_distribution.t
 t/01_load.t
Index: /trunk/DataStore/lib/DataStore/FileSet/Parser.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/FileSet/Parser.pm	(revision 6473)
+++ /trunk/DataStore/lib/DataStore/FileSet/Parser.pm	(revision 6473)
@@ -0,0 +1,95 @@
+# Copyright (C) 2006  Joshua Hoblitt
+#
+# $Id: Parser.pm,v 1.1 2006-02-24 00:52:14 jhoblitt Exp $
+
+package DataStore::FileSet::Parser;
+
+use strict;
+use warnings;
+
+use vars qw($VERSION);
+$VERSION = '0.01';
+
+use Carp qw( carp );
+use Params::Validate qw( validate_pos SCALAR);
+
+=pod
+
+=head1 NAME
+
+DataStore::FileSet::Parser - parses the DataStore 'list' format
+
+=head1 SYNOPSIS
+
+    use DataStore::FileSet::Parser;
+
+    my $parser = DataStore::FileSet::Parser->new;
+
+=head1 DESCRIPTION
+
+=head1 USAGE
+
+=head2 Import Parameters
+
+This module accepts no arguments to it's C<import> method and exports no
+I<symbols>.
+
+=head2 Methods
+
+=head3 Constructors
+
+=over 4
+
+=item * C<new()>
+
+Basic constructor.
+
+Accepts no arguments and returns a L<DataStore::FileSet::Parser> object.
+
+=cut
+
+sub new
+{
+    my $class = shift;
+
+    my $self = bless {}, ref $class || $class;
+
+    return $self;
+}
+
+
+=back
+
+=head3 Object Methods
+
+=over 4
+
+=item * C<parse()>
+
+=cut
+
+sub parse
+{
+    my $self = shift;
+
+    my ($doc) = validate_pos(@_,
+        {
+            type    => SCALAR,
+            regex   => qr/\S+/, # string with atleast 1 non WS char
+        }
+    );
+
+#    @ = qw( OBJECT DOMEFLAT SKYFLAT BIAS DARK );
+}
+
+package DataStore::FileSetRecord;
+
+use base qw( Class::Accessor::Fast );
+
+use vars qw( @BASE_FIELDS );
+
+@BASE_FIELDS = qw( fileset datetime type );
+
+1;
+
+__END__
Index: unk/DataStore/lib/DataStore/Parser.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/Parser.pm	(revision 6472)
+++ 	(revision )
@@ -1,109 +1,0 @@
-# Copyright (C) 2005  Joshua Hoblitt
-#
-# $Id: Parser.pm,v 1.2 2006-02-24 00:11:50 jhoblitt Exp $
-
-package DataStore::Parser;
-
-use strict;
-use warnings;
-
-use vars qw($VERSION);
-$VERSION = '0.01';
-
-
-#################### subroutine header begin ####################
-
-=head2 sample_function
-
- Usage     : How to use this function/method
- Purpose   : What it does
- Returns   : What it returns
- Argument  : What it wants to know
- Throws    : Exceptions and other anomolies
- Comment   : This is a sample subroutine header.
-           : It is polite to include more pod and fewer comments.
-
-See Also   : 
-
-=cut
-
-#################### subroutine header end ####################
-
-
-sub new
-{
-    my ($class, %parameters) = @_;
-
-    my $self = bless ({}, ref ($class) || $class);
-
-    return $self;
-}
-
-
-#################### main pod documentation begin ###################
-## Below is the stub of documentation for your module. 
-## You better edit it!
-
-
-=head1 NAME
-
-DataStore - Module abstract (<= 44 characters) goes here
-
-=head1 SYNOPSIS
-
-  use DataStore;
-  blah blah blah
-
-
-=head1 DESCRIPTION
-
-Stub documentation for this module was created by ExtUtils::ModuleMaker.
-It looks like the author of the extension was negligent enough
-to leave the stub unedited.
-
-Blah blah blah.
-
-
-=head1 USAGE
-
-
-
-=head1 BUGS
-
-
-
-=head1 SUPPORT
-
-
-
-=head1 AUTHOR
-
-    A. U. Thor
-    CPAN ID: MODAUTHOR
-    XYZ Corp.
-    a.u.thor@a.galaxy.far.far.away
-    http://a.galaxy.far.far.away/modules
-
-=head1 COPYRIGHT
-
-This program is free software licensed under the...
-
-	The General Public License (GPL)
-	Version 2, June 1991
-
-The full text of the license can be found in the
-LICENSE file included with this module.
-
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
-
-#################### main pod documentation end ###################
-
-
-1;
-# The preceding line will help the module return a true value
-
Index: /trunk/DataStore/t/01_load.t
===================================================================
--- /trunk/DataStore/t/01_load.t	(revision 6472)
+++ /trunk/DataStore/t/01_load.t	(revision 6473)
@@ -3,10 +3,6 @@
 # t/001_load.t - check module loading and create testing directory
 
-use Test::More tests => 2;
+use Test::More tests => 1;
 
-BEGIN { use_ok( 'DataStore::Parser' ); }
+BEGIN { use_ok( 'DataStore::FileSet::Parser' ); }
 
-my $object = DataStore::Parser->new ();
-isa_ok ($object, 'DataStore::Parser');
-
-