diff --git a/lib/WebGUI/Shop/PayDriver/ITransact.pm b/lib/WebGUI/Shop/PayDriver/ITransact.pm
index a00d4994d..fb6fa3571 100644
--- a/lib/WebGUI/Shop/PayDriver/ITransact.pm
+++ b/lib/WebGUI/Shop/PayDriver/ITransact.pm
@@ -21,7 +21,37 @@ use Tie::IxHash;
 use LWP::UserAgent;
 use HTTP::Request;
 
-use base qw/WebGUI::Shop::PayDriver/;
+use Moose;
+use WebGUI::Definition::Shop;
+extends 'WebGUI::Shop::PayDriver';
+define pluginName => [qw/label PayDriver_ITransact/];
+property vendorId => (
+           fieldType    => 'text',
+           label        => ['vendorId', 'PayDriver_ITransact'],
+           hoverHelp    => ['vendorId help', 'PayDriver_ITransact'],
+         );
+property password => (
+            fieldType   => 'password',
+            label       => ['password', 'PayDriver_ITransact'],
+            hoverHelp   => ['password help', 'PayDriver_ITransact'],
+         );
+property useCVV2 => (
+            fieldType   => 'yesNo',
+            label       => ['use cvv2', 'PayDriver_ITransact'],
+            hoverHelp   => ['use cvv2 help', 'PayDriver_ITransact'],
+         );
+property credentialsTemplateId => (
+            fieldType    => 'template',
+            label        => ['credentials template', 'PayDriver_ITransact'],
+            hoverHelp    => ['credentials template help', 'PayDriver_ITransact'],
+            namespace    => 'Shop/Credentials',
+            default      => 'itransact_credentials1',    
+         );
+property emailMessage => (
+            fieldType   => 'textarea',
+            label       => ['emailMessage', 'PayDriver_ITransact'],
+            hoverHelp   => ['emailMessage help', 'PayDriver_ITransact'],
+         );
 
 #-------------------------------------------------------------------
 sub _generateCancelRecurXml {
@@ -30,8 +60,8 @@ sub _generateCancelRecurXml {
 
     # Construct xml
     my $vendorIdentification;
-    $vendorIdentification->{ VendorId           } = $self->get('vendorId');
-    $vendorIdentification->{ VendorPassword     } = $self->get('password');
+    $vendorIdentification->{ VendorId           } = $self->vendorId;
+    $vendorIdentification->{ VendorPassword     } = $self->password;
     $vendorIdentification->{ HomePage           } = $self->session->setting->get("companyURL");
     
     my $recurUpdate;
@@ -82,7 +112,7 @@ sub _generatePaymentRequestXML {
     $cardInfo->{ CCNum      } = $cardData->{ acct       };
     $cardInfo->{ CCMo       } = $cardData->{ expMonth   };
     $cardInfo->{ CCYr       } = $cardData->{ expYear    };
-    $cardInfo->{ CVV2Number } = $cardData->{ cvv2       } if $self->get('useCVV2');
+    $cardInfo->{ CVV2Number } = $cardData->{ cvv2       } if $self->useCVV2;
 
     my $customerData;
     $customerData->{ Email                          } = $paymentAddress->{ email };
@@ -92,7 +122,7 @@ sub _generatePaymentRequestXML {
     # --- Transaction data part ---
     my $emailText;
     $emailText->{ EmailTextItem     } = [
-        $self->get('emailMessage'),
+        $self->emailMessage,
         'ID: '. $transaction->getId,
     ];
 
@@ -155,8 +185,8 @@ sub _generatePaymentRequestXML {
     $vendorData->{ Element  }->{ Value  } = $transaction->getId;
 
     my $transactionData;
-    $transactionData->{ VendorId        } = $self->get('vendorId');
-    $transactionData->{ VendorPassword  } = $self->get('password');
+    $transactionData->{ VendorId        } = $self->vendorId;
+    $transactionData->{ VendorPassword  } = $self->password;
     $transactionData->{ VendorData      } = $vendorData;
     $transactionData->{ HomePage        } = $self->session->setting->get("companyURL");
     $transactionData->{ RecurringData   } = $recurringData if $recurringData;
@@ -320,8 +350,8 @@ sub checkRecurringTransaction {
     my $xmlStructure = {
         GatewayInterface => {
             VendorIdentification    => {
-                VendorId        => $self->get('vendorId'),
-                VendorPassword  => $self->get('password'),
+                VendorId        => $self->vendorId,
+                VendorPassword  => $self->password,
                 HomePage        => ,
             },
             RecurDetails            => {
@@ -377,56 +407,6 @@ sub checkRecurringTransaction {
 	}
 }
 
-#-------------------------------------------------------------------
-sub definition {
-    my $class       = shift;
-    my $session     = shift;
-    WebGUI::Error::InvalidParam->throw(error => q{Must provide a session variable})
-        unless ref $session eq 'WebGUI::Session';
-    my $definition  = shift;
-
-    my $i18n = WebGUI::International->new($session, 'PayDriver_ITransact');
-
-    tie my %fields, 'Tie::IxHash';
-    %fields = (
-        vendorId        => {
-           fieldType    => 'text',
-           label        => $i18n->get('vendorId'),
-           hoverHelp    => $i18n->get('vendorId help'),
-        },
-        password        => {
-            fieldType   => 'password',
-            label       => $i18n->get('password'),
-            hoverHelp   => $i18n->get('password help'),
-        },
-        useCVV2         => {
-            fieldType   => 'yesNo',
-            label       => $i18n->get('use cvv2'),
-            hoverHelp   => $i18n->get('use cvv2 help'),
-        },
-        credentialsTemplateId  => {
-            fieldType    => 'template',
-            label        => $i18n->get('credentials template'),
-            hoverHelp    => $i18n->get('credentials template help'),
-            namespace    => 'Shop/Credentials',
-            defaultValue => 'itransact_credentials1',	
-        },
-        emailMessage    => {
-            fieldType   => 'textarea',
-            label       => $i18n->get('emailMessage'),
-            hoverHelp   => $i18n->get('emailMessage help'),
-        },
-        # readonly stuff from old plugin here?
-    );
- 
-    push @{ $definition }, {
-        name        => $i18n->get('Itransact'),
-        properties  => \%fields,
-    };
-
-    return $class->SUPER::definition($session, $definition);
-}
-
 #-------------------------------------------------------------------
 
 =head2 doXmlRequest ( xml, [ isGatewayInterface ] )
@@ -599,16 +579,17 @@ sub www_edit {
     my $form = $self->getEditForm;
     $form->submit;
 
+    ##Form to let the user log into their ITransact account from here.
     my $terminal = WebGUI::HTMLForm->new($session, action=>"https://secure.paymentclearing.com/cgi-bin/rc/sess.cgi", extras=>'target="_blank"');
     $terminal->hidden(name=>"ret_addr", value=>"/cgi-bin/rc/sure/sure.cgi?sure_template_code=session_check&sure_use_session_mid=1");
     $terminal->hidden(name=>"override", value=>1);
     $terminal->hidden(name=>"cookie_precheck", value=>0);
-    $terminal->hidden(name=>"mid", value=>$self->get('vendorId'));
-    $terminal->hidden(name=>"pwd", value=>$self->get('password'));
+    $terminal->hidden(name=>"mid", value=>$self->vendorId);
+    $terminal->hidden(name=>"pwd", value=>$self->password);
     $terminal->submit(value=>$i18n->get('show terminal'));
     
     my $output = '<br />';
-    if ($self->get('vendorId')) {
+    if ($self->vendorId) {
         $output .= $terminal->print.'<br />';
     }
     $output .= $i18n->get('extra info').'<br />'
@@ -664,7 +645,7 @@ sub www_getCredentials {
     $var->{cvv2Field} = WebGUI::Form::integer($session, {
         name  => 'cvv2',
         value => $self->session->form->process("cvv2"),
-    }) if $self->get('useCVV2');
+    }) if $self->useCVV2;
 
     $var->{checkoutButton} = WebGUI::Form::submit($session, {
         value => $i18n->get('checkout button', 'Shop'),
@@ -672,7 +653,7 @@ sub www_getCredentials {
     });
     $self->appendCartVariables($var);
 
-    my $output   = $self->processTemplate($self->get("credentialsTemplateId"), $var);
+    my $output   = $self->processTemplate($self->credentialsTemplateId, $var);
     return $session->style->userStyle($output);
 }
 
diff --git a/t/Shop/PayDriver/ITransact.t b/t/Shop/PayDriver/ITransact.t
index d8d2d8df8..e000974f5 100644
--- a/t/Shop/PayDriver/ITransact.t
+++ b/t/Shop/PayDriver/ITransact.t
@@ -35,8 +35,6 @@ $session->user({userId => 3});
 #----------------------------------------------------------------------------
 # Tests
 
-plan tests => 28;
-
 #----------------------------------------------------------------------------
 # figure out if the test can actually run
 
@@ -101,158 +99,6 @@ $cart->update({
     shipperId         => $shipper->getId,
 });
 
-#######################################################################
-#
-# definition
-#
-#######################################################################
-
-note('Testing definition');
-my $definition;
-
-eval { $definition = WebGUI::Shop::PayDriver::ITransact->definition(); };
-$e = Exception::Class->caught();
-isa_ok      ($e, 'WebGUI::Error::InvalidParam', 'definition takes an exception to not giving it a session variable');
-cmp_deeply  (
-    $e,
-    methods(
-        error => 'Must provide a session variable',
-    ),
-    'definition: requires a session variable',
-);
-
-#######################################################################
-#
-# create
-#
-#######################################################################
-
-my $driver;
-
-# Test incorrect for parameters
-
-eval { $driver = WebGUI::Shop::PayDriver::ITransact->create(); };
-$e = Exception::Class->caught();
-isa_ok      ($e, 'WebGUI::Error::InvalidParam', 'create takes exception to not giving it a session object');
-cmp_deeply  (
-    $e,
-    methods(
-        error => 'Must provide a session variable',
-    ),
-    'create takes exception to not giving it a session object',
-);
-
-eval { $driver = WebGUI::Shop::PayDriver::ITransact->create($session,  {}); };
-$e = Exception::Class->caught();
-isa_ok      ($e, 'WebGUI::Error::InvalidParam', 'create takes exception to giving it an empty hashref of options');
-cmp_deeply  (
-    $e,
-    methods(
-        error => 'Must provide a hashref of options',
-    ),
-    'create takes exception to not giving it an empty hashref of options',
-);
-
-my $vendorId = $session->config->get("testing/ITransact/vendorId");
-my $password = $session->config->get("testing/ITransact/password");
-my $hasTestAccount = $vendorId && $password;
-
-if (!$vendorId) {
-    $vendorId = "joeUser";
-}
-if (!$password) {
-    $password = "joePass";
-}
-
-my $options = {
-    label           => 'Fast and harmless',
-    enabled         => 1,
-    groupToUse      => 3,
-    vendorId        => $vendorId,
-    password        => $password,
-    useCVV2         => 1,
-};
-
-$driver = WebGUI::Shop::PayDriver::ITransact->create( $session, $options );
-
-isa_ok  ($driver, 'WebGUI::Shop::PayDriver::ITransact', 'create creates WebGUI::Shop::PayDriver object');
-like($driver->getId, $session->id->getValidator, 'driver id is a valid GUID');
-
-#######################################################################
-#
-# session
-#
-#######################################################################
-
-isa_ok      ($driver->session,  'WebGUI::Session',          'session method returns a session object');
-is          ($session->getId,   $driver->session->getId,    'session method returns OUR session object');
-
-#######################################################################
-#
-# paymentGatewayId, getId
-#
-#######################################################################
-
-like        ($driver->paymentGatewayId, $session->id->getValidator, 'got a valid GUID for paymentGatewayId');
-is          ($driver->getId,            $driver->paymentGatewayId,  'getId returns the same thing as paymentGatewayId');
-
-#######################################################################
-#
-# className
-#
-#######################################################################
-
-is          ($driver->className, ref $driver, 'className property set correctly');
-
-#######################################################################
-#
-# options
-#
-#######################################################################
-
-cmp_deeply(
-    $driver->options,
-    superhashof( $options ),
-    'options accessor works'
-);
-
-#######################################################################
-#
-# getName
-#
-#######################################################################
-
-eval { WebGUI::Shop::PayDriver::ITransact->getName(); };
-$e = Exception::Class->caught();
-isa_ok      ($e, 'WebGUI::Error::InvalidParam', 'getName requires a session object passed to it');
-cmp_deeply  (
-    $e,
-    methods(
-        error => 'Must provide a session variable',
-    ),
-    'getName requires a session object passed to it',
-);
-
-is(WebGUI::Shop::PayDriver::ITransact->getName($session), 'Credit Card (ITransact)', 'getName returns the human readable name of this driver');
-
-#######################################################################
-#
-# get
-#
-#######################################################################
-
-cmp_deeply  ($driver->get,              $driver->options,       'get works like the options method with no param passed');
-is          ($driver->get('enabled'),   1,                      'get the enabled entry from the options');
-is          ($driver->get('label'),     'Fast and harmless',    'get the label entry from the options');
-
-my $optionsCopy = $driver->get;
-$optionsCopy->{label} = 'And now for something completely different';
-isnt(
-    $driver->get('label'),
-    'And now for something completely different',
-    'hashref returned by get() is a copy of the internal hashref'
-);
-
 #######################################################################
 #
 # _generatePaymentRequestXML
@@ -317,20 +163,6 @@ SKIP: {
     ok( $response->is_success, '... was successful');
 }
 
-#######################################################################
-#
-# delete
-#
-#######################################################################
-
-$driver->delete;
-
-my $count = $session->db->quickScalar('select count(*) from paymentGateway where paymentGatewayId=?', [
-    $driver->paymentGatewayId
-]);
-
-is ($count, 0, 'delete deleted the object');
-
-undef $driver;
+done_testing;
 
 #vim:ft=perl