diff --git a/.emacs.desktop b/.emacs.desktop
deleted file mode 100644
index e7370e9..0000000
--- a/.emacs.desktop
+++ /dev/null
@@ -1,71 +0,0 @@
-;; -*- coding: emacs-mule; -*-
-;; --------------------------------------------------------------------------
-;; Desktop File for Emacs
-;; --------------------------------------------------------------------------
-;; Created Fri Feb 18 13:17:58 2005
-;; Emacs version 21.2.1
-
-;; Global section:
-(setq desktop-missing-file-warning nil)
-(setq tags-file-name nil)
-(setq tags-table-list nil)
-(setq search-ring '("sub default" "sub constructor" "constructor" "constructor method" "sub getne" "current" "getnext" "geto" "getobject" "getnextobjectid"))
-(setq regexp-search-ring nil)
-(setq register-alist nil)
-
-;; Buffer section:
-(desktop-create-buffer 205
-  "/home/jjordan/src/perl/Test-MockClass/Makefile.PL"
-  "Makefile.PL"
-  'perl-mode
-  '(nil)
-  1
-  '(nil nil)
-  nil
-  nil
-  nil)
-
-(desktop-create-buffer 205
-  "/home/jjordan/src/perl/Perl-SemanticNet/t/01_SemanticNet_Node.t"
-  "01_SemanticNet_Node.t"
-  'cperl-mode
-  '(nil)
-  441
-  '(nil nil)
-  nil
-  nil
-  nil)
-
-(desktop-create-buffer 205
-  "/home/jjordan/src/perl/Test-MockClass/t/00_MockClass.t"
-  "00_MockClass.t"
-  'cperl-mode
-  '(nil)
-  2858
-  '(1 t)
-  nil
-  nil
-  nil)
-
-(desktop-create-buffer 205
-  "/home/jjordan/src/perl/Test-MockClass/lib/Test/MockClass.pm"
-  "MockClass.pm"
-  'cperl-mode
-  '(nil)
-  12990
-  '(17434 t)
-  nil
-  nil
-  nil)
-
-(desktop-create-buffer 205
-  "/tmp/cvsdz8zNY"
-  "cvsdz8zNY"
-  'fundamental-mode
-  nil
-  14
-  '(nil nil)
-  nil
-  nil
-  nil)
-
diff --git a/MANIFEST b/MANIFEST
index b83aa33..840f006 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,3 @@
-.emacs.desktop
 lib/Test/MockClass/MyClass.pm
 lib/Test/MockClass.pm
 Makefile.PL
diff --git a/META.yml b/META.yml
index a087704..1c04335 100644
--- a/META.yml
+++ b/META.yml
@@ -1,10 +1,26 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Test-MockClass
-version:      1.04
-version_from: lib/Test/MockClass.pm
-installdirs:  site
+--- #YAML:1.0
+name:               Test-MockClass
+version:            1.05
+abstract:           A class to create mock classes and object for testing purposes
+author:
+    - Jeremiah Jordan <jjordan@perlreason.com>
+license:            unknown
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
 requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+    Hook::WrapSub:     0.03
+    Scalar::Util:      1.14
+    Task::Weaken:      0
+    Test::SimpleUnit:  1.21
+    Tie::Watch:        1.1
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.56
+meta-spec:
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4
diff --git a/Makefile.PL b/Makefile.PL
index 7500fd3..a777a66 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,66 +1,5 @@
 #!/usr/bin/perl
-#
-#       Perl Makefile for Test-Mockclass
-#       $Id: Makefile.PL,v 1.1.1.1 2005/02/16 19:46:23 phaedrus Exp $
-#
-#	Invocation:
-#		$ perl Makefile.PL                  # interactive behaviour
-#		$ perl Makefile.PL --defaultdeps    # accept default value on prompts
-#		$ perl Makefile.PL --checkdeps      # check only, no Makefile produced
-#		$ perl Makefile.PL --skipdeps       # ignores all dependencies
-#		$ perl Makefile.PL --testonly       # don't write installation targets
-#
-#	Then, to build:
-#		$ make [all|test|install]           # install dependencies first
-#		$ make checkdeps                    # same as the --checkdeps above
-#		$ make installdeps                  # install dependencies only
-#
-
-# ExtUtils::AutoInstall Bootstrap Code, version 7.
-BEGIN{my$p='ExtUtils::AutoInstall';my$v=0.45;$p->VERSION||0>=$v
-or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL};
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or
-eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
-);1"and exit)and print"==> $p $v required. Install it from CP".
-"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and
-do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo',
-$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1"
-||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{
-require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{
-require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please
-manually install $p $v from cpan.org first...\n"}}}
-
-use File::Find;
-
-# the above handlers must be declared before the 'use' statement
-use ExtUtils::AutoInstall (
-						   
-						   # required AutoInstall version
-						   -version        => '0.40',
-
-						   # core modules; may also be 'all'
-						   -core           => {
-											   Hook::WrapSub				=> 0.03,
-											   Scalar::Util	   				=> 1.14,
-	                                           Test::SimpleUnit				=> 1.21,
-	                                           Tie::Watch				    => 1.1,
-						   },
-	);
-
-# Build a custom list of modules to install. This is because the parser module
-# generation happens because it's a target, so it doesn't exist before the
-# PM list is generated
-my %pm = ();
-
-
-File::Find::find(
-	sub {
-		if (/\.pm$/s) {
-			my $name = "$File::Find::dir/$_";
-			print "Adding: $_ => $name\n";
-			($pm{$name} = $name) =~ s{lib/}{\$(INST_LIBDIR)/}
-		}
-	}, "lib" );
+use ExtUtils::MakeMaker;
 
 WriteMakefile(
 			  NAME				=> 'MockClass',
@@ -68,15 +7,21 @@ WriteMakefile(
 			  VERSION_FROM		=> 'lib/Test/MockClass.pm',
 			  AUTHOR			=> 'Jeremiah Jordan <jjordan@perlreason.com>',
 			  ABSTRACT			=> 'A class to create mock classes and object for testing purposes',
-			  PM				=> \%pm,
+			  PREREQ_PM			=> {
+							   	'Hook::WrapSub'		=> 0.03,
+								'Scalar::Util'	   	=> 1.14,
+								'Task::Weaken'		=> 0,
+								'Test::SimpleUnit'	=> 1.21,
+								'Tie::Watch'		=> 1.1,
+						   },
 			  dist			=> {
-								TARFLAGS		=> 'cvf',
-								CI				=> "cvs commit",
-								RCS_LABEL		=> 'cvs tag r$(VERSION_SYM)',
-								SUFFIX			=> ".gz",
+								TARFLAGS	=> 'cvf',
+								CI		=> "cvs commit",
+								RCS_LABEL	=> 'cvs tag r$(VERSION_SYM)',
+								SUFFIX		=> ".gz",
 								DIST_CP         => 'ln',
 								DIST_DEFAULT	=> 'all tardist',
-								COMPRESS		=> "gzip",
+								COMPRESS	=> "gzip",
 							   },
 			  clean			=> { FILES	=> "*.tar.bz2 *.tar.gz" },
 			 );
diff --git a/lib/Test/MockClass.pm b/lib/Test/MockClass.pm
index fa68a5b..bfa7ac2 100644
--- a/lib/Test/MockClass.pm
+++ b/lib/Test/MockClass.pm
@@ -279,8 +279,8 @@ BEGIN {
 	### Versioning stuff and custom includes
 	use vars qw{$VERSION $RCSID};
   
-	$VERSION	= do { my @r = (q$Revision: 1.4 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
-	$RCSID		= q$Id: MockClass.pm,v 1.4 2005/02/18 21:16:20 phaedrus Exp $;
+	$VERSION	= do { my @r = (q$Revision: 1.5 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+	$RCSID		= q$Id: MockClass.pm,v 1.5 2005/02/18 21:16:20 phaedrus Exp $;
 	use Carp;
 	use Hook::WrapSub qw{wrap_subs unwrap_subs};
 	use Tie::Watch;